iceholidays-frontend 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4468b5bb9777f1aa1b907f832ae75fc918847e5c721bc3bbf434a56d2bb11c
-  data.tar.gz: 3bbc05e5a116b40f46291d072497fd315b445e1ebb5c382dcf7a82083a1e4a45
+  metadata.gz: a3ec38ae7c3d23dd0728bb4db5695e9ce2a59be9d3ec5b4318b57b2bdef2883d
+  data.tar.gz: 786da9eb7f5a1242153cb409a080dec4645ab22040dd0efd1af221b130fa279e
 SHA512:
-  metadata.gz: 41b36ae9c5787a229e9dabf1c7a02434dbf7dddb7f662fb6d2ec7601b3e6139aa1ac5d4e973cacfdefce3b66f1af9c810609f4159a38e2aaf0ae0eaa98051f70
-  data.tar.gz: de17d34551a35097c3e11dcd957ea0ce29199c6f07054ac8af0ba5c61dcbdbc1691198d83d41a89c7f4d5eaa0b8f59a921562e634df133483358ea812d1acd42
+  metadata.gz: 50e8ad6881de2f85f52f003517f290beabb02725320821b689236fa31cc144115d9317f6eeffe4be1cdbeac878698de10c772c29a300d8ecc4a39879cca5f951
+  data.tar.gz: adbae28d5c2eb0a3d1e59163d21e11913592b52b45f5b2e78ade3f2f363a64e67cb81a92bc38e908a9fb54eab02b921ad4276ae67ccbac061ee7acdee3b19991

data/app/assets/stylesheets/iceholidays/frontend/utils/_antd_overrides.scss

@@ -128,4 +128,19 @@ a{
   // .ant-menu-submenu-selected>.ant-menu-submenu-title{
   //   color: #FFFFFF !important;
   // }
+}
+
+.ant-float-btn-default{
+  background-color: #F2F2F280;
+  width: 42px;
+  height: 42px;
+  border-radius: 50px;
+}
+
+.ant-float-btn .ant-float-btn-body .ant-float-btn-content .ant-float-btn-icon{
+  width: 32px;
+
+  svg{
+    color: $primary-color;
+  }
 }

data/app/javascript/api-services/contact-us-api.service.ts

@@ -8,7 +8,8 @@ class ContactUsApi
 
     return axios.post(apiUrl, {inquiry: formValues})
     .then(response => {
-      return Promise.resolve(null);
+      const ok = response.status == 200;
+      return Promise.resolve(ok);
     });
   }
 

data/app/javascript/application.js

@@ -2,4 +2,19 @@
 import "./react"
 //= require jquery3
 //= require popper
-//= require bootstrap
+//= require bootstrap
+
+import '@ant-design/v5-patch-for-react-19';
+
+import { unstableSetRender } from 'antd';
+import { createRoot } from 'react-dom/client';
+
+unstableSetRender((node, container) => {
+  container._reactRoot ||= createRoot(container);
+  const root = container._reactRoot;
+  root.render(node);
+  return async () => {
+    await new Promise((resolve) => setTimeout(resolve, 0));
+    root.unmount();
+  };
+});

data/app/javascript/react/layouts/MainLayout.tsx

@@ -1,8 +1,10 @@
 import React from "react";
 import { Outlet } from "react-router-dom";
-import { Layout } from 'antd';
+import { FloatButton, Layout } from 'antd';
 import MainHeader from "./MainHeader";
 import MainFooter from "./MainFooter";
+import { mdiArrowUpBold } from "@mdi/js";
+import Icon from "@mdi/react";
 
 const { Content } = Layout;
 
@@ -12,6 +14,7 @@ const MainLayout = () => {
       <MainHeader/> 
       <Content>
         <Outlet/>
+        <FloatButton.BackTop icon={<Icon path={mdiArrowUpBold} size="32px" />}/>
       </Content>
       {/* <MainFooter/>  */}
     </Layout>

data/app/javascript/react/pages/ContactUsPage.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import Headline from "../components/shared/Headline";
-import { Button, Col, Flex, Form, Input, notification, Row, Select, Space } from "antd";
-import { mdiFacebook, mdiInstagram, mdiTwitter, mdiWhatsapp, mdiYoutube } from "@mdi/js";
+import { Button, Col, Flex, Form, FormInstance, Input, notification, Row, Select, Space } from "antd";
+import { mdiFacebook, mdiInstagram, mdiWhatsapp } from "@mdi/js";
 import Icon from "@mdi/react";
 import ContactUsApi from "../../api-services/contact-us-api.service";
 const { TextArea } = Input;
@@ -27,6 +27,7 @@ const validateMessages = {
 
 export default class ContactUsPage extends React.Component {
   api = new ContactUsApi;
+  contactForm = React.createRef<FormInstance>();
 
   state = {
     states: []
@@ -45,8 +46,11 @@ export default class ContactUsPage extends React.Component {
 
   submitForm(formValues) {
     this.api.contactInquiry(formValues)
-      .then(_ => {
-        notification.success({message: "Inquiry sent."})
+      .then(success => {
+        if(success){
+          notification['success']({message: "Inquiry sent."});
+          this.contactForm.current?.resetFields();
+        }
       })
       .catch(error => {
         notification.error({ message: 'An error occured while sending inquiry.'});
@@ -67,6 +71,7 @@ export default class ContactUsPage extends React.Component {
               <span>Send us your enquiry</span>
             </div>
             <Form
+              ref={this.contactForm}
               autoComplete="off"
               layout="vertical"
               variant="filled"

data/app/javascript/react/pages/ShowPage.tsx

@@ -112,7 +112,7 @@ class ShowPage extends React.Component <{params;}> {
       })
     .finally(()=>this.setState({loading: false}))
       .catch(error => {
-        notification.error({ message: 'An error occured while loading countries.'});
+        notification.error({ message: 'An error occured while loading itinerary.'});
       });
 
     this.getAgents();

data/lib/iceholidays/frontend/version.rb

@@ -1,5 +1,5 @@
 module Iceholidays
   module Frontend
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/public/iceholidays-assets/application.css

@@ -348,6 +348,20 @@ a {
   text-transform: uppercase;
 }
 
+.ant-float-btn-default {
+  background-color: rgba(242, 242, 242, 0.5019607843);
+  width: 42px;
+  height: 42px;
+  border-radius: 50px;
+}
+
+.ant-float-btn .ant-float-btn-body .ant-float-btn-content .ant-float-btn-icon {
+  width: 32px;
+}
+.ant-float-btn .ant-float-btn-body .ant-float-btn-content .ant-float-btn-icon svg {
+  color: #DCB062;
+}
+
 .slick-track {
   margin: unset;
 }