From a9902c0f28aeaf954bb81e7dbb7a03c1f8c86314 Mon Sep 17 00:00:00 2001 From: dena Date: Tue, 16 Jun 2026 17:05:06 +0200 Subject: [PATCH 01/13] add NaviagationPanel component --- .../Pages/Components/NavigationPanel.vue | 41 + .../Current.vue} | 12 +- .../Pages/TermsOfUse/NavigationLinks.js | 6 + .../Pages/TermsOfUse/NavigationPanel.vue | 23 + src/components/Pages/TermsOfUse/Upcoming.vue | 1171 +++++++++++++++++ src/router/index.js | 10 +- 6 files changed, 1259 insertions(+), 4 deletions(-) create mode 100644 src/components/Pages/Components/NavigationPanel.vue rename src/components/Pages/{TermsOfUse.vue => TermsOfUse/Current.vue} (99%) create mode 100644 src/components/Pages/TermsOfUse/NavigationLinks.js create mode 100644 src/components/Pages/TermsOfUse/NavigationPanel.vue create mode 100644 src/components/Pages/TermsOfUse/Upcoming.vue diff --git a/src/components/Pages/Components/NavigationPanel.vue b/src/components/Pages/Components/NavigationPanel.vue new file mode 100644 index 00000000..a9873426 --- /dev/null +++ b/src/components/Pages/Components/NavigationPanel.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/components/Pages/TermsOfUse.vue b/src/components/Pages/TermsOfUse/Current.vue similarity index 99% rename from src/components/Pages/TermsOfUse.vue rename to src/components/Pages/TermsOfUse/Current.vue index 31129b17..45941aaa 100644 --- a/src/components/Pages/TermsOfUse.vue +++ b/src/components/Pages/TermsOfUse/Current.vue @@ -2,7 +2,11 @@ - + + + + +

Terms Of Use

PLEASE READ THESE TERMS OF USE CAREFULLY BEFORE USING THE SERVICES. @@ -1288,9 +1292,13 @@ diff --git a/src/components/Pages/TermsOfUse/NavigationLinks.js b/src/components/Pages/TermsOfUse/NavigationLinks.js new file mode 100644 index 00000000..4d461f5b --- /dev/null +++ b/src/components/Pages/TermsOfUse/NavigationLinks.js @@ -0,0 +1,6 @@ +const termsOfUseLinks = [ + { title: 'Upcoming Version', route: 'TermsOfUseUpcoming' }, + { title: 'April 11th 2022 (current)', route: 'TermsOfUse' }, +] + +export default termsOfUseLinks diff --git a/src/components/Pages/TermsOfUse/NavigationPanel.vue b/src/components/Pages/TermsOfUse/NavigationPanel.vue new file mode 100644 index 00000000..a5fe9273 --- /dev/null +++ b/src/components/Pages/TermsOfUse/NavigationPanel.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/components/Pages/TermsOfUse/Upcoming.vue b/src/components/Pages/TermsOfUse/Upcoming.vue new file mode 100644 index 00000000..4a0f1f62 --- /dev/null +++ b/src/components/Pages/TermsOfUse/Upcoming.vue @@ -0,0 +1,1171 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 39aa11d0..e6beac7c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,7 +14,8 @@ import ResetPassword from '@/components/Pages/ResetPassword' import EmailVerification from '@/components/Pages/EmailVerification' import CreateWiki from '@/components/Pages/CreateWiki' import TabSettings from '@/components/Pages/ManageWiki/TabSettings' -import TermsOfUse from '@/components/Pages/TermsOfUse' +import Current from '@/components/Pages/TermsOfUse/Current.vue' +import Upcoming from '@/components/Pages/TermsOfUse/Upcoming.vue' import Privacy from '@/components/Pages/Privacy/Privacy' import User from '@/components/Pages/User' import Discovery from '@/components/Pages/Discovery/Discovery' @@ -73,7 +74,12 @@ const router = new Router({ { path: '/terms-of-use', name: 'TermsOfUse', - component: TermsOfUse, + component: Current, + }, + { + path: '/terms-of-use/upcoming', + name: 'TermsOfUseUpcoming', + component: Upcoming, }, { path: '/hosting-policy/pilot', From ddf9afcd1766ec18294347f059680c5343d7e19f Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Jun 2026 09:54:28 +0200 Subject: [PATCH 02/13] delete obsolete NavgationLinks.js --- src/components/Pages/TermsOfUse/NavigationLinks.js | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/components/Pages/TermsOfUse/NavigationLinks.js diff --git a/src/components/Pages/TermsOfUse/NavigationLinks.js b/src/components/Pages/TermsOfUse/NavigationLinks.js deleted file mode 100644 index 4d461f5b..00000000 --- a/src/components/Pages/TermsOfUse/NavigationLinks.js +++ /dev/null @@ -1,6 +0,0 @@ -const termsOfUseLinks = [ - { title: 'Upcoming Version', route: 'TermsOfUseUpcoming' }, - { title: 'April 11th 2022 (current)', route: 'TermsOfUse' }, -] - -export default termsOfUseLinks From 4ec97b90cb619b2c0909229611bb0e96ccf93830 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Jun 2026 11:14:43 +0200 Subject: [PATCH 03/13] use route path instead of name --- src/components/Pages/Components/NavigationPanel.vue | 10 +++++----- src/components/Pages/TermsOfUse/NavigationPanel.vue | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Pages/Components/NavigationPanel.vue b/src/components/Pages/Components/NavigationPanel.vue index a9873426..42cbe0dc 100644 --- a/src/components/Pages/Components/NavigationPanel.vue +++ b/src/components/Pages/Components/NavigationPanel.vue @@ -5,10 +5,10 @@ - + - - + + {{ link.title }} @@ -30,8 +30,8 @@ export default { links: Array, }, methods: { - isCurrentPage (routeName) { - return this.$route.name === routeName + isCurrentPage (path) { + return this.$route.path === path }, }, } diff --git a/src/components/Pages/TermsOfUse/NavigationPanel.vue b/src/components/Pages/TermsOfUse/NavigationPanel.vue index a5fe9273..ae46884c 100644 --- a/src/components/Pages/TermsOfUse/NavigationPanel.vue +++ b/src/components/Pages/TermsOfUse/NavigationPanel.vue @@ -12,8 +12,8 @@ export default { }, data: () => ({ termsOfUseLinks: [ - { title: 'Upcoming Version', routeName: 'TermsOfUseUpcoming' }, - { title: 'April 11th 2022 (current)', routeName: 'TermsOfUse' }, + { title: 'Upcoming Version', routePath: '/terms-of-use/upcoming' }, + { title: 'April 11th 2022 (current)', routePath: '/terms-of-use' }, ], }), } From c5a41e6937e5c057fee8443fb24354a04765a877 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Jun 2026 13:45:06 +0200 Subject: [PATCH 04/13] refactor --- ...ionPanel.vue => PolicyNavigationPanel.vue} | 19 ++++++++++--------- src/components/Pages/TermsOfUse/Current.vue | 2 +- ...anel.vue => TermsOfUseNavigationPanel.vue} | 11 ++++++++--- src/components/Pages/TermsOfUse/Upcoming.vue | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) rename src/components/Pages/Components/{NavigationPanel.vue => PolicyNavigationPanel.vue} (75%) rename src/components/Pages/TermsOfUse/{NavigationPanel.vue => TermsOfUseNavigationPanel.vue} (51%) diff --git a/src/components/Pages/Components/NavigationPanel.vue b/src/components/Pages/Components/PolicyNavigationPanel.vue similarity index 75% rename from src/components/Pages/Components/NavigationPanel.vue rename to src/components/Pages/Components/PolicyNavigationPanel.vue index 42cbe0dc..77d42e72 100644 --- a/src/components/Pages/Components/NavigationPanel.vue +++ b/src/components/Pages/Components/PolicyNavigationPanel.vue @@ -7,13 +7,15 @@ - + + {{ link.title }} + + + {{ link.title }} - - {{ link.title }} @@ -27,13 +29,12 @@ export default { name: 'NavigationPanel', props: { title: String, - links: Array, - }, - methods: { - isCurrentPage (path) { - return this.$route.path === path - }, + currentPath: String, + links: Array, }, + mounted() { + console.log(this.currentPath) + } } diff --git a/src/components/Pages/TermsOfUse/Current.vue b/src/components/Pages/TermsOfUse/Current.vue index 45941aaa..30569132 100644 --- a/src/components/Pages/TermsOfUse/Current.vue +++ b/src/components/Pages/TermsOfUse/Current.vue @@ -1292,7 +1292,7 @@ diff --git a/src/components/Pages/TermsOfUse/Upcoming.vue b/src/components/Pages/TermsOfUse/Upcoming.vue index 4a0f1f62..ce64a18e 100644 --- a/src/components/Pages/TermsOfUse/Upcoming.vue +++ b/src/components/Pages/TermsOfUse/Upcoming.vue @@ -1141,7 +1141,7 @@ diff --git a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue index 8ea5b116..507a80f8 100644 --- a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue +++ b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue @@ -17,10 +17,10 @@ export default { ], currentPath: 'bar', }), - mounted() { + mounted () { this.currentPath = this.$route.path console.log(this.currentPath) - } + }, } From 7f3e8e68abe9b4848e1367c04699c8f7822a7d26 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Jun 2026 13:52:50 +0200 Subject: [PATCH 06/13] remove debug logs --- src/components/Pages/Components/PolicyNavigationPanel.vue | 3 --- src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue | 1 - 2 files changed, 4 deletions(-) diff --git a/src/components/Pages/Components/PolicyNavigationPanel.vue b/src/components/Pages/Components/PolicyNavigationPanel.vue index 59f0182e..7a2451bc 100644 --- a/src/components/Pages/Components/PolicyNavigationPanel.vue +++ b/src/components/Pages/Components/PolicyNavigationPanel.vue @@ -32,9 +32,6 @@ export default { currentPath: String, links: Array, }, - mounted () { - console.log(this.currentPath) - }, } diff --git a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue index 507a80f8..427a8bba 100644 --- a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue +++ b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue @@ -19,7 +19,6 @@ export default { }), mounted () { this.currentPath = this.$route.path - console.log(this.currentPath) }, } From a68f5a86cfaeb6df3780a5d29328d9f11883c21f Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 18 Jun 2026 13:53:39 +0200 Subject: [PATCH 07/13] better initialization --- src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue index 427a8bba..928861a0 100644 --- a/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue +++ b/src/components/Pages/TermsOfUse/TermsOfUseNavigationPanel.vue @@ -15,7 +15,7 @@ export default { { title: 'Upcoming Version', routePath: '/terms-of-use/upcoming' }, { title: 'April 11th 2022 (current)', routePath: '/terms-of-use' }, ], - currentPath: 'bar', + currentPath: null, }), mounted () { this.currentPath = this.$route.path From 9f40cbd94cee3fbcf82fddf7e3ff8600f3a0b455 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 09:57:35 +0200 Subject: [PATCH 08/13] remove examples pages --- src/components/Pages/TermsOfUse/Current.vue | 1319 ------------------ src/components/Pages/TermsOfUse/Upcoming.vue | 1171 ---------------- 2 files changed, 2490 deletions(-) delete mode 100644 src/components/Pages/TermsOfUse/Current.vue delete mode 100644 src/components/Pages/TermsOfUse/Upcoming.vue diff --git a/src/components/Pages/TermsOfUse/Current.vue b/src/components/Pages/TermsOfUse/Current.vue deleted file mode 100644 index 30569132..00000000 --- a/src/components/Pages/TermsOfUse/Current.vue +++ /dev/null @@ -1,1319 +0,0 @@ - - - - - diff --git a/src/components/Pages/TermsOfUse/Upcoming.vue b/src/components/Pages/TermsOfUse/Upcoming.vue deleted file mode 100644 index ce64a18e..00000000 --- a/src/components/Pages/TermsOfUse/Upcoming.vue +++ /dev/null @@ -1,1171 +0,0 @@ - - - - - From 976836a078a0c1855746874c629582aae5761d53 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 09:58:33 +0200 Subject: [PATCH 09/13] add legacy ToU sfc --- src/components/Pages/TermsOfUse.vue | 1311 +++++++++++++++++++++++++++ 1 file changed, 1311 insertions(+) create mode 100644 src/components/Pages/TermsOfUse.vue diff --git a/src/components/Pages/TermsOfUse.vue b/src/components/Pages/TermsOfUse.vue new file mode 100644 index 00000000..31129b17 --- /dev/null +++ b/src/components/Pages/TermsOfUse.vue @@ -0,0 +1,1311 @@ + + + + + From 0f77e538fa502ee4c05c97ec1f8c0f5472d1f81e Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 10:00:03 +0200 Subject: [PATCH 10/13] restore router --- src/router/index.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index e6beac7c..39aa11d0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,8 +14,7 @@ import ResetPassword from '@/components/Pages/ResetPassword' import EmailVerification from '@/components/Pages/EmailVerification' import CreateWiki from '@/components/Pages/CreateWiki' import TabSettings from '@/components/Pages/ManageWiki/TabSettings' -import Current from '@/components/Pages/TermsOfUse/Current.vue' -import Upcoming from '@/components/Pages/TermsOfUse/Upcoming.vue' +import TermsOfUse from '@/components/Pages/TermsOfUse' import Privacy from '@/components/Pages/Privacy/Privacy' import User from '@/components/Pages/User' import Discovery from '@/components/Pages/Discovery/Discovery' @@ -74,12 +73,7 @@ const router = new Router({ { path: '/terms-of-use', name: 'TermsOfUse', - component: Current, - }, - { - path: '/terms-of-use/upcoming', - name: 'TermsOfUseUpcoming', - component: Upcoming, + component: TermsOfUse, }, { path: '/hosting-policy/pilot', From f571e733efa6f9971de01ea31a344df2c25513d9 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 14:26:05 +0200 Subject: [PATCH 11/13] use strict comparison operator --- src/components/Pages/Components/PolicyNavigationPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pages/Components/PolicyNavigationPanel.vue b/src/components/Pages/Components/PolicyNavigationPanel.vue index 7a2451bc..d2dd2500 100644 --- a/src/components/Pages/Components/PolicyNavigationPanel.vue +++ b/src/components/Pages/Components/PolicyNavigationPanel.vue @@ -7,7 +7,7 @@ - + {{ link.title }} From 9155207a8ed2e6bf710e578f6edbfb5721be2e8c Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 14:28:34 +0200 Subject: [PATCH 12/13] remove duplicate element --- src/components/Pages/Components/PolicyNavigationPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pages/Components/PolicyNavigationPanel.vue b/src/components/Pages/Components/PolicyNavigationPanel.vue index d2dd2500..850d45fc 100644 --- a/src/components/Pages/Components/PolicyNavigationPanel.vue +++ b/src/components/Pages/Components/PolicyNavigationPanel.vue @@ -13,7 +13,7 @@ - {{ link.title }} + {{ link.title }} From b5bab8571e61c78a7c8cc425ad0701bec17433fc Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 19 Jun 2026 14:34:52 +0200 Subject: [PATCH 13/13] remove unused style section --- src/components/Pages/Components/PolicyNavigationPanel.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/Pages/Components/PolicyNavigationPanel.vue b/src/components/Pages/Components/PolicyNavigationPanel.vue index 850d45fc..a4fa6693 100644 --- a/src/components/Pages/Components/PolicyNavigationPanel.vue +++ b/src/components/Pages/Components/PolicyNavigationPanel.vue @@ -33,7 +33,4 @@ export default { links: Array, }, } - - -