Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Diploma Thesis Features #73

Merged
merged 51 commits into from
Jul 31, 2023
Merged

Diploma Thesis Features #73

merged 51 commits into from
Jul 31, 2023

Conversation

Cleatuer
Copy link
Collaborator

@Cleatuer Cleatuer commented Jul 27, 2023 •
edited

Contents of this PR:

Oliver Wetl and others added 30 commits July 11, 2023 08:54
[AUTOSUGGEST] Autosuggest Component and Starting to create the Route …
be596a0 
…to call the BE Endpoint
[LANGUAGE_FILTER] display languages in filter
0425569 
I can display all the languages in the filter, however, there is a bug that refuses me from clicking them
[LANGUAGE_FILTER] Finish Filter
f067502 
I finished the language filter in the FE
[AUTOSUGGEST] Autosuggest Component + Starting to create the Route to…
e7fe48a 
… call the BE Endpoint + Ausing the selected Suggestion for search
@wetold19
[AUTOSUGGEST] Autosuggest Component + Starting to create the Route to…
4a9af71 
… call the BE Endpoint + Ausing the selected Suggestion for search
[DISPOSABLE_TOKEN] Redirecting to other page
6dbe1cb
[LANGUAGE_FILTER] remove all test things
8e4be95
[DISPOSABLE_TOKEN] Calling of share BE endpoints
a4b6687
[DISPOSABLE_TOKEN] Redirecting and started share buttons
bc34147
[DISPOSABLE_TOKEN] Insert of share icon
a467aa0
[DISPOSABLE_TOKEN] Share icons spacing
ed5093a
@wetold19
[AUTOSUGGEST] Finishing the Autosuggest Button (hopefully)
2351f4d
[DISPOSABLE_TOKEN] Functionality of share buttons and error handling
27fdaed
[DISPOSABLE_TOKEN] Date according to calendar
ada416f
@wetold19
[MAP_FILTER] Getting the ids of the currently visible tours
9a88dd4
@lenaehm
[MAP_FILTER] implemented remember map state when closing
cf8cbaf
[DISPOSABLE_TOKEN] Error handling and bug fixes
b2e3f24
[DISPOSABLE_TOKEN] React-share for easy sharing on social media
168d3e0
[DISPOSABLE_TOKEN] Translations
77a708b
@wetold19
[MAP_FILTER] Getting the ids of the currently visible tours and savin…
8965c04 
…g them into the store
@lenaehm
[MAP_FILTER] finished and fixed the Remember-Map-State when closing o…
e82718f 
…r reloading the map
implement languages and add comments
921b481
[DISPOSABLE_TOKEN] Comments
7250826
DAT
c76aa65
@lenaehm
[MAP_FILTER] Map remembers its state after clicking on the toggle but…
4242481 
…ton and is reset when reloading the page
@wetold19
Merge remote-tracking branch 'origin/map-filter' into map-filter
4f95ad9 
# Conflicts:
#	src/components/Map/TourMapContainer.js
[DISPOSABLE_TOKEN] Inserted updated language files
6537869
@lenaehm
[MAP_FILTER] Map remembers its state after clicking on the toggle but…
d2669ff 
…ton and filter and is reset when reloading the page
@wetold19
Merge remote-tracking branch 'origin/map-filter' into map-filter
d2e4d0c
@wetold19
[MAP_FILTER] Fixing Merge Conflicts
a8fa2e7
wetold19 and others added 21 commits July 20, 2023 11:52
@wetold19
[MAP_FILTER] Adding the Bounding Box coordinates into the SearchPhras…
007c972 
…e when applying filters
Review
fda4652
[DISPOSABLE_TOKEN] Bug fixes
17891dc
@wetold19
[MAP_FILTER] Adding the Bounding Box coordinates into the SearchPhras…
053949c 
…e whenever the Bounds of the Map change and calling the BE Endpoint to filter the map and handling some errors + removing console.logs
@wetold19
[AUTOSUGGEST] DAT
a0d87e6
[DISPOSABLE_TOKEN] Renaming and removed console.log
58c589c
@wetold19
[AUTOSUGGEST] Review
7213308
@wetold19
[AUTOSUGGEST] Review
26bfb63
@wetold19
[AUTOSUGGEST] Review - final
cc06e1b
@wetold19
[MAP-FILTER] Implemented Debounce [comments still missing :(]
bb8727a
[DISPOSABLE_TOKEN] Generate new link when date changes
b375355
@lenaehm
[MAP_FILTER] No tours bug fix
67e9cc2
@wetold19
[MAP-FILTER] removed console logs Part 1
bccfa8a
[DISPOSABLE_TOKEN] Comments
64f5473
@Cleatuer
Merge branch 'language-filter' into diploma_features
1f16b7e 
# Conflicts:
#	public/i18n/de.json
#	public/i18n/en.json
#	public/i18n/fr.json
#	public/i18n/it.json
#	public/i18n/sl.json
@Cleatuer
Merge branch 'autosuggest' into diploma_features
9e393a3
[DISPOSABLE_TOKEN] Translation files
ebe5f13
@wetold19
[MAP-FILTER] DAT
5b4dae4
@Cleatuer
Merge branch 'disposable-token' into diploma_features
0ba3d8d 
# Conflicts:
#	public/i18n/de.json
#	public/i18n/en.json
#	public/i18n/fr.json
#	public/i18n/it.json
#	public/i18n/sl.json
#	src/actions/crudActions.js
@Cleatuer
Merge branch 'map-filter' into diploma_features
df6d745 
# Conflicts:
#	src/components/Filter/Filter.js
#	src/components/Search/Search.js
#	src/views/Main/Main.js
@Cleatuer
[MAP_FILTER] Formatting
330bd62
@Falsal Falsal merged commit f606270 into dev-drop-slovenia Jul 31, 2023
@Falsal Falsal deleted the diploma_features branch May 15, 2024 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
Zuugle
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Cleatuer @Falsal @wetold19 @lenaehm