Skip to content

Commit

Permalink
Merge branch 'master' into fix-add-new-networks
Browse files Browse the repository at this point in the history
  • Loading branch information
wa0x6e authored Aug 9, 2024
2 parents 28d21b0 + 7b95f1e commit 087bb5a
Show file tree
Hide file tree
Showing 5 changed files with 310 additions and 2 deletions.
5 changes: 4 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ onMounted(async () => {
</KeepAlive>
</router-view>
</div>
<footer v-if="route.name === 'home'" class="mt-auto">
<footer
v-if="route.name === 'home' || route.name === 'terms-and-conditions'"
class="mt-auto"
>
<TheFooter />
</footer>
<div id="action-bar" />
Expand Down
6 changes: 6 additions & 0 deletions src/components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ const snapshotTextLinks = [
link: {
name: 'network'
}
},
{
text: 'terms',
link: {
name: 'terms-and-conditions'
}
}
];
Expand Down
1 change: 1 addition & 0 deletions src/locales/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,7 @@
"about": "About",
"blog": "Blog",
"network-support": "Network support",
"terms": "Terms and conditions",
"jobs": "Jobs",
"faqs": "FAQs",
"github": "GitHub",
Expand Down
8 changes: 7 additions & 1 deletion src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import SpaceTreasury from '@/views/SpaceTreasury.vue';
import SpaceDelegates from '@/views/SpaceDelegates.vue';
import SpaceDelegate from '@/views/SpaceDelegate.vue';
import SpaceBoost from '@/views/SpaceBoost.vue';
import TermsView from '@/views/TermsView.vue';

// The frontend shows all spaces or just a single one, when being accessed
// through that space's custom domain.
Expand Down Expand Up @@ -151,7 +152,12 @@ if (domain) {
}
}
},
{ path: '/network', name: 'network', component: Network }
{ path: '/network', name: 'network', component: Network },
{
path: '/terms-and-conditions',
name: 'terms-and-conditions',
component: TermsView
}
);
}

Expand Down
Loading

0 comments on commit 087bb5a

Please sign in to comment.