Skip to content

Commit

Permalink
fix footer crash
Browse files Browse the repository at this point in the history
  • Loading branch information
cp-isha-p committed Nov 20, 2024
1 parent bc85d91 commit b19022c
Show file tree
Hide file tree
Showing 7 changed files with 1,598 additions and 1,835 deletions.
4 changes: 2 additions & 2 deletions api-doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"social_media_links":
{
"website": "https://canopas.com/",
"facebook": "https://www.facebook.com/canopassoftware","twitter": "https://twitter.com/canopassoftware" ,"instagram": "https://www.instagram.com/canopassoftware/"
"facebook": "https://www.facebook.com/canopassoftware","twitter": "https://x.com/canopas_eng" ,"instagram": "https://www.instagram.com/canopassoftware/"
},
"contact_type": "Chat or Email"
Expand Down Expand Up @@ -221,7 +221,7 @@
"social_media_links": {
"facebook": "https://www.facebook.com/canopassoftware",
"instagram": "https://www.instagram.com/canopassoftware/",
"twitter": "https://twitter.com/canopassoftware",
"twitter": "https://x.com/canopas_eng",
"website": "https://canopas.com/"
},
"idea": "I have an idea for my business that I want to implement with your help.",
Expand Down
4 changes: 2 additions & 2 deletions nuxt-frontend/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default Object.freeze({

// Social media
FACEBOOK_URL: "https://www.facebook.com/canopassoftware",
TWITTER_URL: "https://twitter.com/canopassoftware",
TWITTER_URL: "https://x.com/canopas_eng",
GITHUB_URL: "https://github.com/canopas",
INSTAGRAM_URL: "https://www.instagram.com/canopassoftware/",
LINKEDIN_URL: "https://www.linkedin.com/company/canopasinc",
Expand All @@ -66,7 +66,7 @@ export default Object.freeze({
SOCIAL_MEDIA_DATA: {
facebook: "https://www.facebook.com/canopassoftware",
instagram: "https://www.instagram.com/canopassoftware/",
twitter: "https://twitter.com/canopassoftware",
twitter: "https://x.com/canopas_eng",
blog: "https://blog.canopas.com",
linkedin: "https://www.linkedin.com/company/canopasinc",
youtube: "https://www.youtube.com/channel/UC77VyeTVJ45HiUS_o2GNcBA/videos",
Expand Down
4 changes: 2 additions & 2 deletions nuxt-frontend/config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default Object.freeze({

// Social media
FACEBOOK_URL: "https://www.facebook.com/canopassoftware",
TWITTER_URL: "https://twitter.com/canopassoftware",
TWITTER_URL: "https://x.com/canopas_eng",
GITHUB_URL: "https://github.com/canopas",
INSTAGRAM_URL: "https://www.instagram.com/canopassoftware/",
LINKEDIN_URL: "https://www.linkedin.com/company/canopasinc",
Expand All @@ -66,7 +66,7 @@ export default Object.freeze({
SOCIAL_MEDIA_DATA: {
facebook: "https://www.facebook.com/canopassoftware",
instagram: "https://www.instagram.com/canopassoftware/",
twitter: "https://twitter.com/canopassoftware",
twitter: "https://x.com/canopas_eng",
blog: "https://blog.canopas.com",
linkedin: "https://www.linkedin.com/company/canopasinc",
youtube: "https://www.youtube.com/channel/UC77VyeTVJ45HiUS_o2GNcBA/videos",
Expand Down
2 changes: 1 addition & 1 deletion nuxt-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.15",
"@canopassoftware/nuxt-blog-kit": "^1.1.6",
"@canopassoftware/nuxt-blog-kit": "^1.1.7",
"@ivanv/vue-collapse-transition": "^1.0.2",
"@nuxt/devtools": "latest",
"@nuxtjs/sitemap": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions nuxt-frontend/pages/[slug].vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<template>
<div v-if="!assets">
<Header :animateOnScroll="false" />
<div :class="post.is_resource ? '' : 'container pl-0'">
<div :class="post.is_resource ? '' : 'container px-0'">
<BlogDetail
:mixpanel="$mixpanel"
:recaptcha-key="config.VITE_RECAPTCHA_SITE_KEY"
:post="post"
:website-url="config.BASE_URL"
:contact-api-url="config.API_BASE"
:api-url="config.STRAPI_URL"
/>
</div>
<div class="cta-section">
Expand All @@ -33,7 +34,6 @@
<BlogFooter
:mixpanel="$mixpanel"
:social-media-data="config.SOCIAL_MEDIA_DATA"
:api-url="config.STRAPI_URL"
:company-name="config.COMPANY_NAME"
/>
</div>
Expand Down
20 changes: 19 additions & 1 deletion nuxt-frontend/pages/tag/[slug].vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,31 @@ const posts = ref([]);
const store = useTagListStore();
const resources = computed(() => store.items);
const status = computed(() => store.status);
let postLimit = 2;
let postLimit
const setPostLimit = () => {
if (process.client) {
if (window.innerWidth > 1920 && window.innerHeight > 1080) {
postLimit = 7;
} else if (window.innerWidth > 1440 && window.innerHeight > 900) {
postLimit = 4;
} else if (window.innerWidth > 1024 && window.innerHeight > 768) {
postLimit = 3;
} else if (window.innerWidth <= 1024) {
postLimit = 2;
} else {
postLimit = 2;
}
}
};
await useAsyncData("tags", () =>
store.loadTagBlogs(config.SHOW_DRAFT_POSTS, slug.value),
);
if (status.value === config.SUCCESS) {
setPostLimit()
posts.value = resources.value?.slice(0, postLimit);
}
Expand Down
Loading

0 comments on commit b19022c

Please sign in to comment.