Merge branch 'modifywebsite' of fxie/hichina2023 into master

hichina-main-front-mobile-first/src/i18n/en-US/index.js

@@ -36,6 +36,4 @@ export default {
   enter_email: "Enter your email",
   enter_password: "Enter your password",
   confirm_password: "Confirm your password",
-  place_to_go_in: "Place to go in",
-  guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/ko-KR/index.js

@@ -34,9 +34,4 @@ export default {
   search_by_title: "제목으로 검색",
   deals_for_you: "당신을 위한 거래",
   seasonal_recommendation: "계절 추천",
-  // enter_email: "Enter your email",
-  // enter_password: "Enter your password",
-  // confirm_password: "Confirm your password",
-  // place_to_go_in: "Place to go in",
-  // guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/ru-RU/index.js

@@ -34,9 +34,4 @@ export default {
   search_by_title: "Поиск по названию",
   deals_for_you: "Предложения для вас",
   seasonal_recommendation: "Seasonal Recommendation",
-  enter_email: "Enter your email",
-  enter_password: "Enter your password",
-  confirm_password: "Confirm your password",
-  place_to_go_in: "Place to go in",
-  guidebook_of: "Guidebook of",
 };

hichina-main-front-mobile-first/src/i18n/th-TH/index.js

@@ -36,6 +36,4 @@ export default {
   enter_email: "กรุณากรอกอีเมลของคุณ",
   enter_password: "กรุณากรอกรหัสผ่านของคุณ",
   confirm_password: "กรุณายืนยันรหัสผ่านของคุณ",
-  place_to_go_in: "สถานที่น่าไปใน",
-  guidebook_of: "คู่มือท่องเที่ยวของ",
 };

hichina-main-front-mobile-first/src/pages/DestinationDetailPage.vue

@@ -34,7 +34,7 @@
             <div v-html="description"></div>
           </div>
           <div class="q-pa-md text-h4" style="margin-top: auto">
-            {{ $t("guidebook_of") }} {{ destinationName }}
+            Guidebook of {{ destinationName }}
             <q-btn class="primary" color="primary" @click="goDownload">
               <q-icon left size="3em" name="download" />
               <div>Download</div>
@@ -53,7 +53,7 @@
         margin-left: 30px;
       "
     >
-      {{ $t("place_to_go_in") }} {{ destinationName }}
+      Places to go in {{ destinationName }}
     </div>
 
     <div

hichina-main-front-mobile-first/src/pages/LoginPage.vue

@@ -35,14 +35,26 @@
             </template>
           </q-input>
         </div>
-        <div class="col-12 q-pa-md">
-          <q-btn color="primary" @click="login()" :label="$t('login')" />
+        <div class="col-12 q-pa-md d-flex text-center">
+          <q-btn
+            align="between"
+            class="btn-fixed-width"
+            color="blue"
+            icon="login"
+            @click="login()"
+            :label="$t('login')"
+          />
+        </div>
+        <div
+          style="border-top: 1px solid rgb(202, 202, 202); margin: 20px"
+        ></div>
+        <div class="col-12 q-pa-md d-flex text-center">
           <q-btn
-            icon="lab la-facebook"
-            color="blue-6"
-            dense
-            rounded
-            class="q-ma-sm"
+            align="between"
+            class="btn-fixed-width"
+            color="primary"
+            label="Continue with Facebook"
+            icon="facebook"
             @click="goToFacebookLogin"
           />
         </div>

hichina-main-front-mobile-first/src/pages/ProductDetailPage.vue

@@ -69,7 +69,7 @@
             class="col-11 col-sm-10 flex text-h6 q-pl-sm"
             style="align-items: center"
           >
-            {{ days - 1 }} {{ $t("nights") }} {{ days }} {{ $t("days") }}
+            {{ days - 1 }} nights {{ days }} days
           </div>
           <div
             v-if="productTypeId === FLIGHTPRODUCTTYPE"
@@ -248,12 +248,7 @@
     >
       <div
         class="col-12"
-        style="
-          background-color: white;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-        "
+        style="background-color: white"
         v-html="productDescription"
       ></div>
     </div>