Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
5b5685c
init: start travel-app
spaceragga Mar 7, 2021
f1e1625
chore: add material-ui
spaceragga Mar 7, 2021
9e1050a
chore: add redux store
spaceragga Mar 7, 2021
bfdc4e0
docs: update README with task description
aleksei-bulgak Mar 7, 2021
5e31911
feat: add script to deploy appication o gh-pages
aleksei-bulgak Mar 7, 2021
42979f6
feat: add react-router, base structure
Kvadeck Mar 8, 2021
ccfd97e
feat: clear <>
Kvadeck Mar 8, 2021
daafb36
feat: add actions folder
Kvadeck Mar 8, 2021
21cc443
feat: rm logo and reportWebVitals
Kvadeck Mar 8, 2021
aba0d56
feat: replace let
Kvadeck Mar 8, 2021
2395a13
Merge pull request #10 from natein/react-router-add
Kvadeck Mar 8, 2021
6f592cc
feat: sight-gallery component and base markup
Kvadeck Mar 8, 2021
08a979f
feat: add main page
spaceragga Mar 8, 2021
69e95b1
fix: typo
spaceragga Mar 8, 2021
33fcef2
Merge pull request #13 from natein/main-page
spaceragga Mar 8, 2021
9cf8bd7
Merge branch 'develop' into travel-app-attractions-gallery
Kvadeck Mar 9, 2021
87db17e
feat: add countryMap component (#12)
aleksei-bulgak-study Mar 9, 2021
215e93c
feat: widget date
kvalexandr Mar 9, 2021
f81d03d
Merge branch 'develop' into widget-date
kvalexandr Mar 9, 2021
022f879
Merge branch 'develop' into travel-app-attractions
Kvadeck Mar 9, 2021
366e72e
fix: position of cards on main screan. Move people info into separate…
aleksei-bulgak-study Mar 9, 2021
6c764c4
feat: style page and widget
kvalexandr Mar 9, 2021
17b0094
Merge branch 'develop' into widget-date
kvalexandr Mar 9, 2021
4484347
refactor: styles app, home, header, footer, page
kvalexandr Mar 9, 2021
da01f82
feat: gallery add
Kvadeck Mar 9, 2021
a7e5cd9
Merge pull request #15 from natein/widget-date
kvalexandr Mar 9, 2021
5e2955e
feat: update routing. add styles for not found page (#18)
aleksei-bulgak-study Mar 9, 2021
1af6a2b
Merge branch 'develop' into travel-app-attractions-gallery
Kvadeck Mar 10, 2021
9331f9b
feat: update loading page. add language selector (#21)
aleksei-bulgak-study Mar 10, 2021
b2ae00f
Merge branch 'develop' into travel-app-attractions-gallery
Kvadeck Mar 10, 2021
13bc48f
feat: change arrow, fullscreen icon.
Kvadeck Mar 10, 2021
94de236
Merge pull request #17 from natein/travel-app-attractions-gallery
Kvadeck Mar 10, 2021
918a5c7
feat: sightGallery structure update
Kvadeck Mar 10, 2021
5cc07a0
feat: add video
Kvadeck Mar 10, 2021
0866b36
feat: add countries list into header component (#22)
aleksei-bulgak-study Mar 10, 2021
486b10d
feat: clean up
Kvadeck Mar 10, 2021
be43699
Merge pull request #24 from natein/vidos-for-page
Kvadeck Mar 10, 2021
dd50749
fix: change country select to use default select tag (#23)
aleksei-bulgak-study Mar 10, 2021
036e89c
feat: add search button
spaceragga Mar 10, 2021
1a238b0
fix: removed arrow in select
aleksei-bulgak-study Mar 10, 2021
4514964
fix: length of search field
aleksei-bulgak-study Mar 10, 2021
46bb674
fix: output color in chrome on linux
aleksei-bulgak-study Mar 10, 2021
d9b4ecc
feat: add shadow for card on hower
aleksei-bulgak-study Mar 10, 2021
7e44c92
feat: widget currency
kvalexandr Mar 10, 2021
62468c3
fix: styles for active card
aleksei-bulgak-study Mar 10, 2021
eb6e62e
fix: merge
kvalexandr Mar 10, 2021
6a95901
feat: add search component to be in focus by default
aleksei-bulgak-study Mar 10, 2021
5d2c161
feat: add i18n functionality for all static labels (#25)
aleksei-bulgak-study Mar 11, 2021
025e6d0
doc: fix team lastname
Kvadeck Mar 11, 2021
7958509
fix: currency api and update
kvalexandr Mar 11, 2021
25c61a0
fix: merge i18
kvalexandr Mar 11, 2021
51f020e
Merge pull request #27 from natein/widget-currency
kvalexandr Mar 11, 2021
55baab8
fix: error message in logs related to i18n suspence functionality (#26)
aleksei-bulgak-study Mar 11, 2021
9a8cead
fix: url and key prop
kvalexandr Mar 11, 2021
a2893ab
Merge pull request #28 from natein/widgets
kvalexandr Mar 11, 2021
4b351ba
feat: title adaptive fixes.
Kvadeck Mar 11, 2021
9ba3378
feat: footer translate
Kvadeck Mar 11, 2021
9456cfc
fix: widget when russia is selected
aleksei-bulgak-study Mar 11, 2021
9f63aef
fix: currency ruble
kvalexandr Mar 11, 2021
fa94087
Merge pull request #29 from natein/widget-currency-update
kvalexandr Mar 11, 2021
2a1120b
style: fix cards height
spaceragga Mar 11, 2021
1e82556
feat: footer useEffect fix
Kvadeck Mar 12, 2021
baf606a
Merge branch 'develop' of https://github.com/natein/travel-app into d…
Kvadeck Mar 12, 2021
db4de3f
feat: remove button on card
Mar 12, 2021
11eedd3
style: fix content style
spaceragga Mar 12, 2021
53227e1
feat: add handlers
spaceragga Mar 12, 2021
1bf0e11
feat: add search logic. close issue #8
spaceragga Mar 12, 2021
a1d164e
style: add input cross
spaceragga Mar 12, 2021
46594be
Weather widget (#30)
natein Mar 13, 2021
da23952
feat: add modal login
spaceragga Mar 13, 2021
99622c5
fix: search functionality
aleksei-bulgak-study Mar 13, 2021
7cd4acf
fix: update search results on enter
aleksei-bulgak-study Mar 13, 2021
0d24095
fix: add navigation controls for map component
aleksei-bulgak-study Mar 13, 2021
52b55ac
fix: ussue with empty search and pressing on search button
aleksei-bulgak-study Mar 13, 2021
9e22008
feat: store selected locale in local storage and use value on next visit
aleksei-bulgak-study Mar 13, 2021
35cf205
fix: change widgets color
natein Mar 13, 2021
44c3a95
fix: change path
natein Mar 13, 2021
a9f4b1b
Merge pull request #32 from natein/bug-fixing
natein Mar 13, 2021
c6f087a
feat: add login/sign-up pages
aleksei-bulgak-study Mar 13, 2021
646da2e
fix: search field populated when return back from country [age
aleksei-bulgak-study Mar 14, 2021
8750308
feat:add auth functionality based on server response
aleksei-bulgak-study Mar 14, 2021
e990e00
fix: add propTypes for components
aleksei-bulgak-study Mar 14, 2021
30a14f1
fix: add propTypes
aleksei-bulgak-study Mar 14, 2021
659d6fe
docs: update readme file in develop branch based on PR requirements
aleksei-bulgak-study Mar 14, 2021
be601f9
docs: checked point related to backend rating functionality
aleksei-bulgak-study Mar 14, 2021
7d48c4e
feat: add ability to preserv user info between page refresh
aleksei-bulgak-study Mar 14, 2021
03cf389
fix: logout functionality
aleksei-bulgak-study Mar 14, 2021
b2fdc45
docs: checked authorization point
aleksei-bulgak-study Mar 14, 2021
864a102
fix: galery image size flickering
aleksei-bulgak-study Mar 15, 2021
a9c0ff5
fix: currency nominal and add loader
kvalexandr Mar 17, 2021
bb32356
Merge pull request #34 from natein/currency-update
kvalexandr Mar 17, 2021
6af5707
style: fix login icon style
spaceragga Mar 17, 2021
ff5fbc6
feat: covered components with tests (#35)
aleksei-bulgak-study Mar 17, 2021
b546fbf
docs: readme
spaceragga Mar 17, 2021
1db8239
fix: specify PUBLIC_URL during build on gh-pages
Mar 17, 2021
fc1afd6
fix: translation path on prod build
Mar 17, 2021
29c4994
fix: translation path on prod build
Mar 17, 2021
40d9f88
feat: add star raiting
Kvadeck Mar 17, 2021
6dd85d0
Merge pull request #37 from natein/star-raiting
Kvadeck Mar 17, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoiZWxlZG9uIiwiYSI6ImNrbTBmaGJrMjFpdzMydXJ6dDZmZW1vMWYifQ.7z-Hdb4FoPZCKJYM1it7Tw
REACT_APP_API=https://rss-travel-app.herokuapp.com
REACT_APP_CURRENCY_URL=https://www.cbr-xml-daily.ru/daily_json.js
REACT_APP_WEATHER_KEY=2ecdbcd74acc04b0ecd238486739e5ae
23 changes: 23 additions & 0 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Build and Deploy
on:
push:
branches:
- develop
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.3.1

- name: Install and Build
run: |
export PUBLIC_URL=https://natein.github.io/travel-app
npm ci
npm run build

- name: Deploy
uses: JamesIves/github-pages-deploy-action@4.0.0
with:
branch: gh-pages
folder: build
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/travel-app.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"semi": true,
"trailingComma": "all",
"singleQuote": true,
"printWidth": 120,
"tabWidth": 4
}
48 changes: 47 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,48 @@
# travel-app
React application for travelers.

| Deadline | Repo name | Branch name |
| ---------------- | ---------- | ----------- |
| 17.03.2021 23:59 | travel-app | travel-app |

travel-app - приложение для виртуальных путешествий по странам мира.

Task: https://github.com/rolling-scopes-school/tasks/blob/master/tasks/react/travel-app.md

Deploy: https://natein-travel-app.netlify.app/
https://natein.github.io/travel-app

Backend application: https://rss-travel-app.herokuapp.com/swagger-ui

## Выполненная функциональность

### Вёрстка, дизайн, UI +30
- [x] вёрстка, дизайн, UI главной страницы приложения +10
- [x] вёрстка, дизайн, UI страницы страны +10
- [x] оригинальный интересный качественный дизайн приложения, используются анимации, сложные элементы оформления, например, эффект параллакса, полноэкранное видео, синемаграфы и т.д. +10

### Главная страница приложения +30
- [x] поиск +10
- [x] локализация главной страницы приложения на три языка +10
- [x] карточки стран +10

### Страница страны +80
- [x] локализация страницы страны на три языка +10
- [x] фото страны, название страны, название её столицы, краткая информация о стране +10
- [x] фотогалерея достопримечательностей +10
- [x] видео +10
- [x] карта +10
- [x] информер погоды +10
- [x] виджет даты и времени в столице страны +10
- [x] курс местной валюты +10

### Бекенд +40

- [x] создано API для получения данных о стране +10 (API создаётся с использованием фреймворка express/koa/nest и тд. При использовании **json-server** и подобных инструментов пункт выполненным не считается.)
- [x] при регистрации нового пользователя можно указать его имя и загрузить фото +10
- [x] реализована авторизация и разавторизация пользователя. Основная часть приложения доступна без авторизации. При перезагрузке приложения данные о пользователе сохраняются +10
- [x] есть возможность проставить и сохранить в бекенде рейтинг достопримечательностям страны, увидеть других проголосовавших и какой рейтинг указал каждый из них +10

### Дополнительный функционал +20

- [ ] продуман и реализован не предусмотренный заданием сложный в реализации дополнительный функционал, который существенно улучшает качество приложения +10
- [x] написано не меньше 10 юнит-тестов, использующих различные [методы jest](https://jestjs.io/docs/ru/expect) +10
Loading