Skip to content

Commit d5ae9ba

Browse files
author
thisismeonmounteverest
committed
Solve merge conflicts.
1 parent 9a1e538 commit d5ae9ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2437
-3037
lines changed

‎assets/js/profile/edit.js‎

Lines changed: 34 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,34 @@
1-
import 'ekko-lightbox';
2-
import MicroModal from 'micromodal';
3-
4-
const L = require("leaflet");
5-
6-
const editLanguages = document.querySelectorAll("[data-edit-language]");
7-
8-
editLanguages.forEach(editLanguage => {
9-
editLanguage.addEventListener("click", e => {
10-
editLanguages.forEach(editLanguage => {
11-
editLanguage.classList.add('btn-outline-primary')
12-
editLanguage.classList.remove('btn-primary')
13-
})
14-
15-
const languages = document.querySelectorAll('[id^=profile-language-]')
16-
languages.forEach(language => {
17-
language.classList.add('u:hidden!')
18-
})
19-
20-
const language = e.target.dataset.editLanguage
21-
const activeLanguage = document.getElementById("profile-language-" + language)
22-
const editLanguageButton = document.querySelector("[data-edit-language=" + language + "]")
23-
24-
activeLanguage.classList.remove('u:hidden!')
25-
editLanguageButton.classList.add("btn-primary")
26-
editLanguageButton.classList.remove("btn-outline-primary")
27-
})
28-
})
29-
30-
const deleteLanguages = document.querySelectorAll("[data-delete-language]")
31-
32-
deleteLanguages.forEach( deleteLanguage => {
33-
deleteLanguage.addEventListener('click', (e) => {
34-
const modalId = 'delete-' + e.target.dataset.deleteLanguage;
35-
MicroModal.show(modalId);
36-
})
37-
})
38-
39-
const locationMaps = document.querySelectorAll('[id^=location-map]')
40-
41-
locationMaps.forEach( locationMap => {
42-
const latitude = document.getElementById('latitude').value;
43-
const longitude = document.getElementById('longitude').value;
44-
45-
const map = L.map(locationMap, {
46-
zoomControl: false,
47-
boxZoom: false
48-
}).setView([latitude, longitude], 10)
49-
50-
map.attributionControl.setPrefix(false)
51-
const markerIcon = L.icon({
52-
iconUrl: 'images/icons/marker_drop.png',
53-
iconShadowUrl: 'images/icons/marker_drop_shadow.png',
54-
iconSize: [25, 25],
55-
iconAnchor: [13, 0],
56-
});
57-
58-
L.marker(new L.LatLng(latitude, longitude), {icon: markerIcon}).addTo(map)
59-
60-
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
61-
subdomains: ['a', 'b', 'c']
62-
}).addTo(map)
63-
})
64-
1+
import MicroModal from 'micromodal';
2+
3+
const editLanguages = document.querySelectorAll("[data-edit-language]");
4+
5+
editLanguages.forEach(editLanguage => {
6+
editLanguage.addEventListener("click", e => {
7+
editLanguages.forEach(editLanguage => {
8+
editLanguage.classList.add('btn-outline-primary')
9+
editLanguage.classList.remove('btn-primary')
10+
})
11+
12+
const languages = document.querySelectorAll('[id^=profile-language-]')
13+
languages.forEach(language => {
14+
language.classList.add('u:hidden!')
15+
})
16+
17+
const language = e.target.dataset.editLanguage
18+
const activeLanguage = document.getElementById("profile-language-" + language)
19+
const editLanguageButton = document.querySelector("[data-edit-language=" + language + "]")
20+
21+
activeLanguage.classList.remove('u:hidden!')
22+
editLanguageButton.classList.add("btn-primary")
23+
editLanguageButton.classList.remove("btn-outline-primary")
24+
})
25+
})
26+
27+
const deleteLanguages = document.querySelectorAll("[data-delete-language]")
28+
29+
deleteLanguages.forEach( deleteLanguage => {
30+
deleteLanguage.addEventListener('click', (e) => {
31+
const modalId = 'delete-' + e.target.dataset.deleteLanguage;
32+
MicroModal.show(modalId);
33+
})
34+
})

‎assets/js/profile/edit_accommodation.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import { default as rangeSlider } from 'rangeslider-pure';
2+
3+
const slider = document.querySelectorAll('input[type="range"]');
4+
5+
function updateValueOutput(value) {
6+
const valueOutput = document.getElementsByClassName('rangeSlider__value-output');
7+
if (valueOutput.length) {
8+
valueOutput[0].innerHTML = markers[value];
9+
}
10+
}
11+
12+
const initializeSlider = () => {
13+
return rangeSlider.create(slider, {
14+
onInit: function() {
15+
updateValueOutput(0);
16+
},
17+
onSlide: function(value, percent, position) {
18+
updateValueOutput(value);
19+
}
20+
});
21+
};
22+
23+
initializeSlider();
24+
25+
const accommodationRadiobuttons = document.querySelectorAll(".btn-light");
26+
const hostingInterest = document.getElementById('hosting_interest');
27+
const radioHandler = (event) => {
28+
if (event.target.type === 'radio') {
29+
if (event.target.value === 'no') {
30+
hostingInterest.classList.remove('u:block');
31+
hostingInterest.classList.add('u:hidden');
32+
} else {
33+
hostingInterest.classList.remove('u:hidden');
34+
hostingInterest.classList.add('u:block');
35+
}
36+
}
37+
}
38+
39+
for (let radio of accommodationRadiobuttons) {
40+
radio.addEventListener("click", radioHandler)
41+
}

‎assets/js/profile/profile.js‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
1-
require('ekko-lightbox');
2-
3-
const languageSwitch = document.getElementById("language-switch");
4-
5-
languageSwitch.addEventListener("change", e => {
6-
const languages = document.querySelectorAll('[id^=profile-language-]');
7-
languages.forEach(language => {
8-
language.classList.add('u:hidden!');
9-
})
10-
const current = document.getElementById("profile-language-" + e.target.value);
11-
current.classList.remove('u:hidden!')
12-
})
1+
require('ekko-lightbox');
2+
const L = require("leaflet");
3+
4+
const locationMaps = document.querySelectorAll('[id^=location-map]')
5+
6+
locationMaps.forEach( locationMap => {
7+
const latitude = document.getElementById('latitude').value;
8+
const longitude = document.getElementById('longitude').value;
9+
10+
const map = L.map(locationMap, {
11+
zoomControl: false,
12+
boxZoom: false
13+
}).setView([latitude, longitude], 10)
14+
15+
map.attributionControl.setPrefix(false)
16+
const markerIcon = L.icon({
17+
iconUrl: 'images/icons/marker_drop.png',
18+
iconShadowUrl: 'images/icons/marker_drop_shadow.png',
19+
iconSize: [25, 25],
20+
iconAnchor: [13, 0],
21+
});
22+
23+
L.marker(new L.LatLng(latitude, longitude), {icon: markerIcon}).addTo(map)
24+
25+
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
26+
subdomains: ['a', 'b', 'c']
27+
}).addTo(map)
28+
})
29+

‎assets/js/profile/show.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const languageSwitch = document.getElementById("language-switch");
2+
3+
languageSwitch.addEventListener("change", e => {
4+
const languages = document.querySelectorAll('[id^=profile-language-]');
5+
languages.forEach(language => {
6+
language.classList.add('u:hidden!');
7+
})
8+
const current = document.getElementById("profile-language-" + e.target.value);
9+
current.classList.remove('u:hidden!')
10+
})
11+

0 commit comments

Comments
 (0)