From 9cff6bd7ecbd95cfb1508d0c05d771a671c8b4d6 Mon Sep 17 00:00:00 2001 From: Late Night Defender Date: Sun, 19 Nov 2023 04:01:06 +0700 Subject: [PATCH 1/5] Change from localhost to actual LL backend --- src/views/Login.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/Login.vue b/src/views/Login.vue index 8fc7346..503f3ef 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -136,7 +136,7 @@ export default { client_id: import.meta.env.VITE_CLIENT_ID, scope: "email profile openid", - redirect_uri: "http://localhost:5000/api/users/googleAuth/callback", + redirect_uri: "https://little-lines-backend.techtransthai.org/api/users/googleAuth/callback", callback: response => { if (response.code) { this.sendCodeToBackend(response.code); @@ -151,7 +151,7 @@ export default { const headers = { Authorization: code }; - const response = await axios.post("http://localhost:5000/api/users/googleAuth", null, { headers }); + const response = await axios.post("https://little-lines-backend.techtransthai.org/api/users/googleAuth", null, { headers }); const userDetails = response.data; console.log("User Details:", userDetails); this.userDetails = userDetails; @@ -190,4 +190,4 @@ export default { justify-content: center; align-content: center; } - \ No newline at end of file + From 58fcf52cd445180aa15f05087fdca7f5a52f93ed Mon Sep 17 00:00:00 2001 From: SRP-mango Date: Tue, 21 Nov 2023 00:39:14 +0700 Subject: [PATCH 2/5] toggle destination card and move when click location on search bar list --- src/components/NavigationMapCard.vue | 38 ++++++++++++++++++++++++++++ src/views/Home.vue | 1 + 2 files changed, 39 insertions(+) create mode 100644 src/components/NavigationMapCard.vue diff --git a/src/components/NavigationMapCard.vue b/src/components/NavigationMapCard.vue new file mode 100644 index 0000000..860c01c --- /dev/null +++ b/src/components/NavigationMapCard.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/src/views/Home.vue b/src/views/Home.vue index d6d0e65..86c00a9 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -121,6 +121,7 @@ const moveToLocation = (result) => { const lon = parseFloat(result.lon); center.value = [lon, lat]; showSearchBar.value = false; + popupData.value = result; // Set the selected search result as popupData }; const performSearch = async () => { From fab2a6d2b63afe64cfdead61c362ac6627de61a6 Mon Sep 17 00:00:00 2001 From: |NekoVari| Date: Wed, 22 Nov 2023 15:08:28 +0000 Subject: [PATCH 3/5] Fix bug register --- src/views/Register.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/Register.vue b/src/views/Register.vue index 64057e3..8ce68be 100644 --- a/src/views/Register.vue +++ b/src/views/Register.vue @@ -13,8 +13,8 @@
@@ -98,7 +98,7 @@ import eyeNotLooking from '../../icons/Material/eye-not-looking.svg'; return { pageTitle: 'สมัครสมาชิก', input: { - username: '', + email: '', password: '', passwordConfirm:'' } @@ -114,9 +114,9 @@ import eyeNotLooking from '../../icons/Material/eye-not-looking.svg'; 'Content-Type': 'application/json', }, body: JSON.stringify({ - username: this.input.username, + username: "temp", password: this.input.password, - email: "asdf", + email: this.input.email, isGoogleAccount: false }) }) @@ -137,7 +137,7 @@ import eyeNotLooking from '../../icons/Material/eye-not-looking.svg'; }) console.log("fisnished fetch"); } else { - console.log('Username and Password cannot be empty'); + console.log('Email and Password cannot be empty'); } } }, @@ -148,7 +148,7 @@ import eyeNotLooking from '../../icons/Material/eye-not-looking.svg'; .user { background-color: aqua; } -.username, .password { +.email, .password { margin-bottom: -21px; } .check { From fe568132a13a9a10e07d437f7aac4f8a122c0e76 Mon Sep 17 00:00:00 2001 From: SRP-mango Date: Thu, 23 Nov 2023 01:39:14 +0700 Subject: [PATCH 4/5] add next stage of destinationcard --- src/components/DestinationInfoCard.vue | 248 ++++++++++++++++++++++++- src/iconsets/adwaita.ts | 0 src/views/Home.vue | 8 +- 3 files changed, 240 insertions(+), 16 deletions(-) create mode 100644 src/iconsets/adwaita.ts diff --git a/src/components/DestinationInfoCard.vue b/src/components/DestinationInfoCard.vue index c453c03..f4b2f9d 100644 --- a/src/components/DestinationInfoCard.vue +++ b/src/components/DestinationInfoCard.vue @@ -2,13 +2,18 @@ - +
+ + + + {{nearestStructureData.display_name}} + {{destination.subTitle}} + + - {{detial[1].title}} + {{nearestStructureData.lat}} , {{nearestStructureData.lon}} @@ -49,15 +54,150 @@ เพิ่มลงในสถานที่โปรด - + ดูเส้นทาง - + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 นาที + + + + + ย้อนกลับ + + เริ่มการนำทาง + + +
+ + - @@ -65,6 +205,7 @@ import findLocation from '../../icons/Material/find-location.svg'; import clock from '../../icons/Material/clock.svg'; import check from '../../icons/Material/check-round.svg'; +import DestinationInfoCard from '@/components/DestinationInfoCard.vue'; const destination = { title: "อนุสาวรีย์ชัยสมรภูมิ", subTitle: "ราชเทวี , กรุงเทพมหานคร" @@ -97,14 +238,28 @@ export default { data() { return { showPopup: true, + showRoute: false, }; }, + computed: { + cardHeight() { + return this.showRoute ? '45vh' : '60vh'; + }, + }, methods: { closePopup() { this.showPopup = false; this.onClose(); }, + viewRoute() { + this.showRoute = true; + }, + viewPopup(){ + this.showPopup = true; + this.showRoute = false; + } }, + }; @@ -145,5 +300,80 @@ export default { width: 100%; height: 45vh; } + +.title-text +{ + color: rgba(0, 0, 0, 1); + font-style: normal; + font-size: 24px; + font-weight: 700; + line-height: 1.2; + letter-spacing: 0px; + text-decoration: none; + text-transform: none; +} + +.sutitle-text{ + color: rgba(155, 155, 155, 1); + font-style: normal; + font-size: 16px; + font-weight: 400; + line-height: 1.2; + letter-spacing: 0px; + text-decoration: none; + text-transform: none; +} + +.icon-walk { + background-color: #000000; + -webkit-mask: url(icons/Adwaita/walk.svg) no-repeat center; + mask: url(icons/Adwaita/walk.svg) no-repeat center; +} +.icon-wheelchair { + background-color: #000000; + -webkit-mask: url(icons/Adwaita/wheelchair.svg) no-repeat center; + mask: url(icons/Adwaita/wheelchair.svg) no-repeat center; +} +.icon-plus { + background-color: #000000; + -webkit-mask: url(icons/Adwaita/plus.svg) no-repeat center; + mask: url(icons/Adwaita/plus.svg) no-repeat center; +} +.icon-vertical-arrows { + background-color: #000000; + -webkit-mask: url(icons/Adwaita/vertical-arrows.svg) no-repeat center; + mask: url(icons/Adwaita/vertical-arrows.svg) no-repeat center; +} +.icon-flag { + background-color: #000000; + -webkit-mask: url(icons/Adwaita/flag.svg) no-repeat center; + mask: url(icons/Adwaita/flag.svg) no-repeat center; +} + +.btn-toggle +{ + border-radius: 10px; + background-color: rgba(230, 230, 230, 1); +} + +.btn-toggle .btn +{ + border-radius: 0px; + background-color: rgba(230, 230, 230, 1); +} + +.v-input__control +{ + + max-height: 6vh; + max-width: 50vw; +} + +.v-field__input +{ + /* font-size: 14px; */ + padding: 0; +} + \ No newline at end of file diff --git a/src/iconsets/adwaita.ts b/src/iconsets/adwaita.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Home.vue b/src/views/Home.vue index 86c00a9..71bf7c1 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -5,12 +5,6 @@ class="router-view" /> - - { const lon = parseFloat(result.lon); center.value = [lon, lat]; showSearchBar.value = false; - popupData.value = result; // Set the selected search result as popupData + popupData.value = result; }; const performSearch = async () => { From 725a999e9a2df0f496406c1a3a032fafd97e7440 Mon Sep 17 00:00:00 2001 From: SRP-mango Date: Thu, 23 Nov 2023 01:46:40 +0700 Subject: [PATCH 5/5] fix some bug (css) --- src/components/DestinationInfoCard.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/DestinationInfoCard.vue b/src/components/DestinationInfoCard.vue index f4b2f9d..085345b 100644 --- a/src/components/DestinationInfoCard.vue +++ b/src/components/DestinationInfoCard.vue @@ -1,6 +1,6 @@