ASWI - Pokročilé softwarové inženýrství » ASWI 2023 » Mobilní aplikace k digitalizovanému inventáři sbírky Rudolfa II. (Kryl) - One team to rule them all

Merge branch 'stack-navigation' into dev

1. Conflicts:
2. src/components/listView/ListView.tsx
3. src/components/listView/ListViewInventoryGroup.tsx
4. src/pages/Navigation.tsx
5. src/pages/SearchPage.tsx
6. src/stores/store.ts
7. src/theme/nativeBaseTheme.ts

re #10871: PlanViewPage: Populate rooms and labels, highlight selected room

re #10871: PlanViewPage: Drag/move castlePlan

re #10871: PlanViewPage: Parse map xml

re #10871: PlanViewPage: CastlePlanView init : get map image

re #10871: PlanViewPage: ListView integration

re #10844: PlanViewPage: GetItemInventories, GetPlanItems

re #10844: NoteViewPage: GetPlanAll redux implementation

Merge remote-tracking branch 'origin/dev' into stack-navigation

1. Conflicts:
2. package-lock.json
3. package.json
4. src/pages/LoginPage.tsx
5. src/pages/Navigation.tsx

re #10819 ItemView next, previous item list switching

re #10819 ItemView prevent error states

re #10819 ItemView refactor layout, optimize

REVERT: reverting debug toasts
re #10822

DEBUG: Added JSON.stringify for debug objects
re #10822

DEBUG: Added toast for in app debug
re #10822

#re 10797 NoteListView lazy loading -> scroll load more notes

#re 10797 NoteView: Note replies base

#re 10797 NotesListView set replying optimize

re #10678: ItemNotes refactor NoteListView

re #10678 ItemViewUpdate: show related notes

Merge branch 'dev' into searchpage-advencement

1. Conflicts:
2. src/pages/Navigation.tsx
3. src/stores/store.ts

HomePage connected to new backend endpoint, SearchPage edited to take argument to display inventory content on open
re #10715

Logout and Login fixed
re #10715

Added grouping by inventory to ListView, loading of other pages of listView implemented
re #10606

re #10569: NotesView: NotesView in ItemDetail

re #10569: NotesView: Create note, update note, triggerRefresh

re #10569: NotesView: Get Notes

Merge branch 'dev' into 'ItemView-#10343'

1. Conflicts:
2. App.tsx
3. package.json
4. src/stores/store.ts

re #10454: ItemView: TabBar one / more concordances

re #10454: ItemView: switching notes / item view

re #10454: ItemView: concordances switch fix

re #10454: ItemView: concordance tabs

re #10454: ItemView getItemNotes

re #10454: ItemView concordances switching

re #10454: ItemView: get itemViewState fix

re #10454: ItemView: minor api call update

re #10454: ItemView: getting all required fields from api

SearchPage implementations with base of list view for results of the search
re #10342

#re 10343 ItemView: Redux thunks, slice

#re 10343 checkAuth fix

#re 10343 Check authentication request added

#re 10171
Demo of application login with redux, axios and nativeBase. Tested

adding redux for user state management and testing loading images

adding redux for user state management