Skip to content

Commit 420b98a

Browse files
jdaigneau5jdaigneau5
authored
Merge pull request #3142 from CVEProject/tat-3133-feedback
Tat 3133 feedback
2 parents de1e7a4 + b0c28e4 commit 420b98a

35 files changed

+49
-171
lines changed

‎src/assets/data/navigation.json‎

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"id": "1.0",
1010
"label": "Overview",
1111
"path": "Overview",
12-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQUQ2NlY3VzlWSU45MURGUE1RTzk2MzFJSCQlQCN0PWcu",
1312
"items": {
1413
"About the CVE Program": {
1514
"anchorId": "AbouttheCVEProgram",
@@ -21,7 +20,6 @@
2120
"id": "1.1",
2221
"label": "History",
2322
"path": "History",
24-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQ0dUUkRNSENISFo0WVgzVUZGQ1pUVzZORyQlQCN0PWcu",
2523
"items": {
2624
"Overview": {
2725
"anchorId": "Overview",
@@ -37,7 +35,6 @@
3735
"id": "1.2",
3836
"label": "Process",
3937
"path": "Process",
40-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUOVNGSko4RjZWVFBWREFLS0lNT1JROVVYMCQlQCN0PWcu",
4138
"items": {
4239
"CVE Record Lifecycle": {
4340
"anchorId": "CVERecordLifecycle",
@@ -49,7 +46,6 @@
4946
"id": "1.3",
5047
"label": "Related Efforts",
5148
"path": "RelatedEfforts",
52-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUOFlBNUNSQUdGNUZBVVczVE03N1NSVkxMRCQlQCN0PWcu",
5349
"items": {
5450
"National Vulnerability Database (NVD)": {
5551
"anchorId": "NVD",
@@ -81,7 +77,6 @@
8177
"id": "1.4",
8278
"label": "Metrics",
8379
"path": "Metrics",
84-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUOEJQQUM0TkhXTkw3VEpPVEwzTVpNRERIViQlQCN0PWcu",
8580
"items": {
8681
"Published CVE Records": {
8782
"anchorId": "PublishedCVERecords",
@@ -117,7 +112,6 @@
117112
"id": "2.0",
118113
"label": "Partner",
119114
"path": "Partner",
120-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUMjlQQk05RjdRMTFOMzNKUTJSSko1WEc5UyQlQCN0PWcu",
121115
"items": {
122116
"HowToBecomeAPartner": {
123117
"anchorId": "HowToBecomeAPartner",
@@ -144,8 +138,7 @@
144138
"List of Partners": {
145139
"id": "2.1",
146140
"label": "List of Partners",
147-
"path": "ListofPartners",
148-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUNlNEWjRGOENNNFFJRFJLR1dEMTZKSkJBTCQlQCN0PWcu"
141+
"path": "ListofPartners"
149142
}
150143
}
151144
},
@@ -159,14 +152,12 @@
159152
"id": "3.0",
160153
"label": "Structure",
161154
"path": "Structure",
162-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUMllERE9OM1RLODc5QUpaMFNRRzlTMTFCNSQlQCN0PWcu",
163155
"items": {}
164156
},
165157
"Program Relationship with Partners": {
166158
"id": "3.1",
167159
"label": "Program Relationship with Partners",
168160
"path": "ProgramRelationshipwithPartners",
169-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlURVdPQ0wwVUY0TDJCVkUwOE9MOE0wRzhUTCQlQCN0PWcu",
170161
"items": {
171162
"Internal Partners": {
172163
"anchorId": "InternalPartners",
@@ -186,7 +177,6 @@
186177
"id": "3.2",
187178
"label": "Board",
188179
"path": "Board",
189-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUMkVOTFhKTFFYWDZRNFVNQkZaT0k5QjZGRCQlQCN0PWcu",
190180
"items": {
191181
"Resources": {
192182
"anchorId": "Resources",
@@ -202,7 +192,6 @@
202192
"id": "3.3",
203193
"label": "Working Groups",
204194
"path": "WorkingGroups",
205-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUMlQ5R0xYQkFER0k3SlIyQjY1M1pDQ1M2USQlQCN0PWcu",
206195
"items": {
207196
"Automation Working Group (AWG)": {
208197
"anchorId": "AutomationWorkingGroupAWG",
@@ -242,7 +231,6 @@
242231
"id": "3.4",
243232
"label": "CVE Numbering Authorities (CNAs)",
244233
"path": "CNAs",
245-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUMEVVUFYzUUlENktMWFhETTZUNkpKMEpUTiQlQCN0PWcu",
246234
"primaryNavPath": "/ProgramOrganization/CNAs",
247235
"items": {
248236
"CNA Program Growth": {
@@ -255,7 +243,6 @@
255243
"id": "3.5",
256244
"label": "Authorized Data Publishers (ADPs)",
257245
"path": "ADPs",
258-
"surveyLink": "",
259246
"items": {
260247
"Active ADPs": {
261248
"anchorId": "ActiveAdps",
@@ -273,7 +260,6 @@
273260
"id": "4",
274261
"label": "CVE List Downloads",
275262
"path": "Downloads",
276-
"surveyLink": "",
277263
"primaryNavPath": "/Downloads",
278264
"submenu": {
279265
"Downloads": {
@@ -302,7 +288,6 @@
302288
"id": "5.0",
303289
"label": "Resources",
304290
"path": "Resources",
305-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUOFFET0RYUkFXSjRYMUY1Tko5VzRIU0ZKVCQlQCN0PWcu",
306291
"items": {
307292
"CVE Program Idea Tracker": {
308293
"anchorId": "CVEProgramIdeaTracker",
@@ -337,22 +322,19 @@
337322
"Glossary": {
338323
"id": "5.1",
339324
"label": "Glossary",
340-
"path": "Glossary",
341-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQ0QxU0NVMkNGVEwxVUlFWlFBTUhEWUFXWSQlQCN0PWcu"
325+
"path": "Glossary"
342326
},
343327
"FAQs": {
344328
"id": "5.2",
345329
"label": "FAQs",
346-
"path": "FAQs",
347-
"surveyLink": ""
330+
"path": "FAQs"
348331
}
349332
}
350333
},
351334
"AllNews": {
352335
"id": "6",
353336
"label": "All News",
354337
"path": "AllNews",
355-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQjU5WVc3UkQxVUNHRUIyS1lQVlQ4N0lGWiQlQCN0PWcu",
356338
"submenu": {
357339
"All": {
358340
"id": "6.0",
@@ -366,26 +348,22 @@
366348
"News Articles": {
367349
"id": "6.1.1",
368350
"label": "News Articles",
369-
"path": "News",
370-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQjU5WVc3UkQxVUNHRUIyS1lQVlQ4N0lGWiQlQCN0PWcu"
351+
"path": "News"
371352
},
372353
"Blogs": {
373354
"id": "6.1.2",
374355
"label": "Blogs",
375-
"path": "Blogs",
376-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNURUsxMVA4OVlYQTAxT1VLRVpOU1o1MFFDVy4u"
356+
"path": "Blogs"
377357
},
378358
"Podcasts": {
379359
"id": "6.1.3",
380360
"label": "Podcasts",
381-
"path": "Podcasts",
382-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNUNllQWFpVT0FDTkhJMUxNTU9FSFI5S08yVi4u"
361+
"path": "Podcasts"
383362
},
384363
"Press Releases": {
385364
"id": "6.1.4",
386365
"label": "Press Releases",
387-
"path": "PressReleases",
388-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQjU5WVc3UkQxVUNHRUIyS1lQVlQ4N0lGWiQlQCN0PWcu"
366+
"path": "PressReleases"
389367
}
390368
}
391369
},
@@ -396,20 +374,17 @@
396374
"News Articles": {
397375
"id": "6.2.1",
398376
"label": "News Articles",
399-
"path": "NewsArchives",
400-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQjU5WVc3UkQxVUNHRUIyS1lQVlQ4N0lGWiQlQCN0PWcu"
377+
"path": "NewsArchives"
401378
},
402379
"Blogs": {
403380
"id": "6.2.2",
404381
"label": "Blogs",
405-
"path": "BlogArchives",
406-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNURUsxMVA4OVlYQTAxT1VLRVpOU1o1MFFDVy4u"
382+
"path": "BlogArchives"
407383
},
408384
"Press Releases": {
409385
"id": "6.2.3",
410386
"label": "Press Releases",
411-
"path": "PressReleaseArchives",
412-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUQjU5WVc3UkQxVUNHRUIyS1lQVlQ4N0lGWiQlQCN0PWcu"
387+
"path": "PressReleaseArchives"
413388
}
414389
}
415390
},
@@ -424,13 +399,11 @@
424399
"id": "7",
425400
"label": "All Resources",
426401
"path": "AllResources",
427-
"surveyLink": "",
428402
"submenu": {
429403
"Reserve IDs & Publish Records": {
430404
"id": "7.0",
431405
"label": "Reserve IDs & Publish Records (CNAs Only)",
432406
"path": "/AllResources/ReserveIDsPublishRecordsForCNAs",
433-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNURUxKUEM3NExMQjNNUk9XOURTSEVMMzdHMy4u",
434407
"items": {
435408
"Self-Service Automation": {
436409
"anchorId": "SelfServiceAutomation",
@@ -447,7 +420,6 @@
447420
"label": "CVE Services",
448421
"path": "CveServices",
449422
"primaryNavPath": "/AllResources",
450-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNUN0tZRFFYT0s0QUpGQzA5OU5ZMlg1MERNVC4u",
451423
"submenu": {
452424
"Overview": {
453425
"id": "7.1.1",
@@ -535,15 +507,13 @@
535507
"id": "8.0",
536508
"alternatePageName": "Reserve IDs & Publish Records for CNAs",
537509
"label": "CNAs",
538-
"path": "ReserveIDsPublishRecordsForCNAs",
539-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgtdpBcyuIGlPo5G4BrphEpNURUxKUEM3NExMQjNNUk9XOURTSEVMMzdHMy4u"
510+
"path": "ReserveIDsPublishRecordsForCNAs"
540511
},
541512
"Non-CNAs": {
542513
"id": "8.1",
543514
"alternatePageName": "Report/Request for Non-CNAs",
544515
"label": "Non-CNAs",
545516
"path": "ReportRequestForNonCNAs",
546-
"surveyLink": "https://forms.office.com/Pages/ResponsePage.aspx?id=SNwgxlAdUkmLOd9NVNdNgksLeUGJ_vlDujipnPAHzqlUM1pCRzRYWFUwQkJKQlVTOFRPREI0MUlMOSQlQCN0PWcu",
547517
"items": {
548518
"Request a CVE ID": {
549519
"anchorId": "RequestCVEID",
@@ -558,5 +528,4 @@
558528
}
559529
}
560530
}
561-
}
562-
531+
}

‎src/components/HomeModule.vue‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,7 @@
158158
</div>
159159
</div>
160160
</section>
161-
<div class="cve-feedback-link">
162-
<span class="icon-text">
163-
<a href="https://tinyurl.com/cve-home-page-survey" target="_blank">Provide feedback for this page
164-
<span class="icon is-size-7 cve-icon-xxs">
165-
<p id="extenalSurveyLink" class="is-hidden">external site</p>
166-
<font-awesome-icon icon="external-link-alt" aria-labelledby="extenalSurveyLink" aria-hidden="false"/>
167-
</span>
168-
</a>
169-
</span>
170-
</div>
161+
<SurveyLinkComponent/>
171162
<p class="cve-help-text is-centered has-text-centered mt-2">
172163
Some of the links will take you back to the
173164
<span>

‎src/components/NewsModule.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
</nav>
8282
</div>
8383
</main>
84-
<SurveyLinkComponent v-if="newsPageInfo.newsType == 'all'" :surveyLink="cvenavs['AllNews']['surveyLink']" />
85-
<SurveyLinkComponent v-else :surveyLink="cvenavs['AllNews']['submenu']['Recent']['submenu'][newsPageInfo.label]['surveyLink']" />
84+
<SurveyLinkComponent/>
8685
</div>
8786
<div class="column is-3" :class="isNavSidebarHiddenTouch ? 'is-hidden-touch' : ''">
8887
<NavigationSidebar :nav="cvenavs['AllNews']" :isNavSidebarHiddenTouch="isNavSidebarHiddenTouch"/>
@@ -93,15 +92,13 @@
9392

9493
<script>
9594
import NavigationSidebar from '@/components/NavigationSidebar.vue';
96-
import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
9795
import newsData from '@/assets/data/news.json';
9896
import newsMixins from '@/mixins/newsMixins';
9997
10098
export default {
10199
name: 'NewsModule',
102100
components: {
103101
NavigationSidebar,
104-
SurveyLinkComponent,
105102
},
106103
data() {
107104
return {

‎src/components/SurveyLinkComponent.vue‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="cve-feedback-link">
3-
<a :href="surveyLink" target="_blank">
3+
<a href="https://forms.office.com/g/dFzysrHLpR" target="_blank">
44
Provide feedback for this page
55
<span class="icon cve-icon-xxs">
66
<p id="externalSurveyLink" class="is-hidden">
@@ -12,15 +12,6 @@
1212
</div>
1313
</template>
1414

15-
<script>export default {
16-
props: {
17-
surveyLink: {
18-
type: String,
19-
},
20-
},
21-
};
22-
</script>
23-
2415
<!-- Add "scoped" attribute to limit CSS to this component only -->
2516
<style lang="scss">
2617
@import '../assets/style/globals.scss';

‎src/main.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import LoadScript from 'vue-plugin-load-script';
66

77
import App from './App.vue';
88
import router from './router/index.js';
9-
import ExternalLinkMessage from './components/ExternalLinkMessage.vue';
9+
import ExternalLinkMessage from '@/components/ExternalLinkMessage.vue';
10+
import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
1011
import { usePartnerStore } from '@/stores/partners';
1112

1213

@@ -44,4 +45,6 @@ app.use(router);
4445

4546
app.component('font-awesome-icon', FontAwesomeIcon);
4647
app.component('ExternalLinkMessage', ExternalLinkMessage);
48+
app.component('SurveyLinkComponent', SurveyLinkComponent);
49+
4750
app.mount('#app');

‎src/views/About/History.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@
118118
<li><a href="https://www.nsa.gov/" target="_blank">National Security Agency (NSA):</a> Tony Sager</li>
119119
<li><a href="https://www.af.mil/" target="_blank">U.S. Air Force:</a> Matt Mleziva</li>
120120
</ul>
121-
122-
<SurveyLinkComponent :surveyLink="cvenavs['About']['submenu']['History']['surveyLink']" />
121+
<SurveyLinkComponent/>
123122
</div>
124123
</main>
125124
</div>
@@ -130,14 +129,13 @@
130129
</div>
131130
</template>
132131

133-
<script>import NavigationSidebar from '@/components/NavigationSidebar.vue';
134-
import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
132+
<script>
133+
import NavigationSidebar from '@/components/NavigationSidebar.vue';
135134
136135
export default {
137136
name: 'History',
138137
components: {
139138
NavigationSidebar,
140-
SurveyLinkComponent,
141139
},
142140
props: {
143141
cvenavs: {

‎src/views/About/Metrics.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
</div>
518518
</div>
519519
</div>
520-
<SurveyLinkComponent :surveyLink="cvenavs['About']['submenu']['Metrics']['surveyLink']" />
520+
<SurveyLinkComponent/>
521521
</main>
522522
</div>
523523
<div class="column is-3 is-hidden-touch">
@@ -529,15 +529,13 @@
529529

530530
<script>
531531
import NavigationSidebar from '@/components/NavigationSidebar.vue';
532-
import SurveyLinkComponent from '@/components/SurveyLinkComponent.vue';
533532
import MetricsData from '@/assets/data/metrics.json';
534533
import { usePartnerStore } from '@/stores/partners';
535534
536535
export default {
537536
name: 'Metrics',
538537
components: {
539538
NavigationSidebar,
540-
SurveyLinkComponent,
541539
},
542540
props: {
543541
cvenavs: {

0 commit comments

Comments
 (0)