Merge remote-tracking branch 'origin/master'

airalab · May 1, 2024 · e02e5e0 · e02e5e0
2 parents d870218 + 59aa33e
commit e02e5e0
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 119 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "@libp2p/websockets": "^8.0.16",
     "@polkadot/api": "^9.14.1",
     "@polkadot/ui-keyring": "^2.11.1",
-    "@unhead/vue": "^1.9.5",
     "axios": "^1.4.0",
     "core-js": "^3.32.0",
     "dayjs": "^1.11.9",

diff --git a/public/index.html b/public/index.html
@@ -4,8 +4,17 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <meta rel="icon" type="image/png" sizes="192x192" href="<%= BASE_URL %>images/meta/app-icon-192.png" />
+    <meta rel="icon" type="image/png" sizes="512x512" href="<%= BASE_URL %>images/meta/app-icon-512.png" />
+
+    <meta property="og:title" content="Robonomics Dapp" />
+    <meta property="og:description" content="Decetralized application for working with Robonomics Parachain, Cloud tools and Smart home" />
+    <meta property="og:image" content="<%= BASE_URL %>images/meta/OG-Default.png" />
+    <meta name="description" content="Decetralized application for working with Robonomics Parachain, Cloud tools and Smart home" />
+
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Robonomics</title>
+    <title>Robonomics Dapp</title>
   </head>
   <body>
     <noscript>

diff --git a/src/App.vue b/src/App.vue
@@ -15,7 +15,6 @@ import MainLayout from "@/components/layouts/Main.vue";
 import { inject, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { useStore } from "vuex";
-import { useHead, useSeoMeta } from '@unhead/vue';
 
 export default {
   name: "App",
@@ -50,37 +49,11 @@ export default {
     );
     store.commit("ipfs/setGateways", IpfsProvider.gateways);
 
-    const ogtitle = ref((title) => title ? `${title} / Robonomics Dapp` : 'Robonomics Dapp')
-    useHead({
-      titleTemplate: ogtitle.value,
-      meta: [
-        {
-          rel: "icon",
-          type: "image/png",
-          sizes: "192x192",
-          href: "images/meta/app-icon-192.png"
-        },
-        {
-          rel: "icon",
-          type: "image/png",
-          sizes: "512x512",
-          href: "images/meta/app-icon-512.png"
-        },
-      ],
-    })
-
-    useSeoMeta({
-      ogTitle: ogtitle.value,
-      description: 'Decetralized application for working with Robonomics Parachain, Cloud tools and Smart home',
-      ogDescription: 'Decetralized application for working with Robonomics Parachain, Cloud tools and Smart home',
-      ogImage: 'images/meta/OG-Default.png'
-    })
-
     watch(route, () => {
       title.value = route?.meta?.title;
-      // document.title = title.value
-      //   ? `${title.value} – Robonomics Network dApp`
-      //   : "Robonomics Network dApp";
+      const resulttitle = title.value ? `${title.value} / Robonomics Dapp` : "Robonomics Dapp";
+      document.title = resulttitle;
+      document.querySelector('meta[property="og:title"]').setAttribute("content", resulttitle);
     });
 
     return {

diff --git a/src/main.js b/src/main.js
@@ -7,14 +7,12 @@ import robonomics from "./plugins/robonomics";
 import router from "./router";
 import store from "./store";
 import filters from "./utils/filters";
-import { createHead } from '@unhead/vue';
 
 import "robonomics-ui-vue/style.css";
 
 window.Buffer = Buffer;
 
 const app = createApp(App);
-const head = createHead(); // for meta
 
 app
   .use(router)
@@ -36,5 +34,4 @@ app
     ]
   })
   .use(robonomicsUI, { store })
-  .use(head)
   .mount("#app");
diff --git a/src/views/RwsActivate.vue b/src/views/RwsActivate.vue
@@ -21,13 +21,9 @@ import { useSubscription } from "@/hooks/useSubscription";
 import { fromUnit } from "@/utils/tools";
 import { bnToBn } from "@polkadot/util";
 import { computed, onUnmounted, ref, watchEffect } from "vue";
-import { useSeoMeta } from "@unhead/vue";
 
 export default {
   setup() {
-    useSeoMeta({
-      title: "Buy a subscription"
-    });
 
     const price = ref(0);
     const freeAuctions = ref(0);

diff --git a/src/views/RwsSetup.vue b/src/views/RwsSetup.vue
@@ -20,13 +20,9 @@ import { u8aToHex } from "@polkadot/util";
 import { decodeAddress, encodeAddress } from "@polkadot/util-crypto";
 import { computed, watch } from "vue";
 import { useStore } from "vuex";
-import { useSeoMeta } from '@unhead/vue';
 
 export default {
   setup() {
-    useSeoMeta({
-      title: 'Setup'
-    })
 
     const store = useStore();
 

diff --git a/src/views/RwsSetupNew.vue b/src/views/RwsSetupNew.vue
@@ -7,14 +7,9 @@
 <script>
 import { Keyring } from "@polkadot/api";
 import { encodeAddress } from "@polkadot/util-crypto";
-import { useSeoMeta } from '@unhead/vue';
 
 export default {
   setup() {
-    useSeoMeta({
-      title: 'New setup'
-    })
-
     let onSave = (rws, setStatus) => {
       if (!rws.owner || !rws.name || !rws.controller || !rws.scontroller) {
         setStatus("error", "All fields are required");

diff --git a/src/views/Services.vue b/src/views/Services.vue
@@ -82,16 +82,4 @@
       </robo-card>
     </robo-grid>
   </robo-layout-section>
-</template>
-
-<script>
-import { useSeoMeta } from '@unhead/vue';
-
-export default {
-  setup() {
-    useSeoMeta({
-      title: 'Services'
-    })
-  }
-}
-</script>
+</template>
diff --git a/src/views/Telemetry.vue b/src/views/Telemetry.vue
@@ -16,14 +16,9 @@ import { getConfigCid, getLastDatalog, parseJson } from "@/utils/telemetry";
 import { stringToU8a, u8aToString } from "@polkadot/util";
 import { onUnmounted, reactive, ref, watch, watchEffect } from "vue";
 import { useStore } from "vuex";
-import { useSeoMeta } from '@unhead/vue';
 
 export default {
   setup() {
-    useSeoMeta({
-      title: 'Devices'
-    })
-
     const datalog = ref(null);
     const config = ref(null);
     const datalogCid = ref("");

diff --git a/yarn.lock b/yarn.lock
@@ -2717,39 +2717,6 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@unhead/[email protected]":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@unhead/dom/-/dom-1.9.5.tgz#c9c8ce775776418b51b940f893d7d8ed2a394553"
-  integrity sha512-t+JvAFX+Qkx+IEZFBQV5rZoj/6SKHd3tqXqxpsER588DWxU0J6dzvAVJrof/vRTMjJ1lM6B8SxKhZppSZ7H2iQ==
-  dependencies:
-    "@unhead/schema" "1.9.5"
-    "@unhead/shared" "1.9.5"
-
-"@unhead/[email protected]":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@unhead/schema/-/schema-1.9.5.tgz#cf6acd4c8a8091e12e6fb33a2c14cd206cdde4ca"
-  integrity sha512-n0upGPplBn5Y/4PIqKp7/tzOhz7USos5lFjf8UKvMNoOIitEa+avP2u7gRQ9yOhHmOAH9AXDeX7mhSvhO+Tqxw==
-  dependencies:
-    hookable "^5.5.3"
-    zhead "^2.2.4"
-
-"@unhead/[email protected]":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@unhead/shared/-/shared-1.9.5.tgz#e1e999a7fbb7514d6890a7009a99fcee1e2b1890"
-  integrity sha512-WN2T8th1wYn4A1bb6o8Z59wNVMPkD6YdNQIlmSbEP9zuSYyVEh3BIxqSdxWM/xl8atN8fNwVW06knaF51VmKXA==
-  dependencies:
-    "@unhead/schema" "1.9.5"
-
-"@unhead/vue@^1.9.5":
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/@unhead/vue/-/vue-1.9.5.tgz#259a4124ab3129007b1aad39a0d3ef7f43179114"
-  integrity sha512-L3yDB6Mwm92gJNPqZApMwfGluS0agR0HIizkXCKKz3WkZ+ef/negMwTNGpTtd+uqh/+hSyG73Bl4yySuPsD4nA==
-  dependencies:
-    "@unhead/schema" "1.9.5"
-    "@unhead/shared" "1.9.5"
-    hookable "^5.5.3"
-    unhead "1.9.5"
-
 "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz"
@@ -5254,11 +5221,6 @@ highlight.js@^10.7.1:
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-hookable@^5.5.3:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/hookable/-/hookable-5.5.3.tgz#6cfc358984a1ef991e2518cb9ed4a778bbd3215d"
-  integrity sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
@@ -8438,16 +8400,6 @@ undici@^5.12.0:
   dependencies:
     busboy "^1.6.0"
 
-[email protected]:
-  version "1.9.5"
-  resolved "https://registry.yarnpkg.com/unhead/-/unhead-1.9.5.tgz#500f46f4673f8dbc55915a2b741c7505b6be4939"
-  integrity sha512-eBKDPO9IMltRze9mHNYIVdosjlqoNFbwJRbykGT/7z/S5uYR2QRCXmIhEsJT4crffy6KQyB5ywLPqjRPx0s57A==
-  dependencies:
-    "@unhead/dom" "1.9.5"
-    "@unhead/schema" "1.9.5"
-    "@unhead/shared" "1.9.5"
-    hookable "^5.5.3"
-
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
@@ -8947,8 +8899,3 @@ yorkie@^2.0.0:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
-
-zhead@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/zhead/-/zhead-2.2.4.tgz#87cd1e2c3d2f465fa9f43b8db23f9716dfe6bed7"
-  integrity sha512-8F0OI5dpWIA5IGG5NHUg9staDwz/ZPxZtvGVf01j7vHqSyZ0raHY+78atOVxRqb73AotX22uV1pXt3gYSstGag==