Browse Source

Merge branch 'dev' of craft-in-america/vue-wp into master

tags/1.0.3
Alej 3 years ago
parent
commit
cd0046ef2a

+ 3
- 3
vue-theme/src/components/footer.vue View File

84
                         li
84
                         li
85
                             router-link(to="/page/center")   Info
85
                             router-link(to="/page/center")   Info
86
                         li
86
                         li
87
-                            router-link(to="/exhibition")   Exhibitions
87
+                            router-link(to="/exhibition/sorted/by-current-and-upcoming")   Exhibitions
88
                         li 
88
                         li 
89
                             router-link(to="/event/sorted/by-current-and-upcoming")   Events 
89
                             router-link(to="/event/sorted/by-current-and-upcoming")   Events 
90
                         li
90
                         li
91
                             router-link(to="/event?type=talks")   Talks & Interviews
91
                             router-link(to="/event?type=talks")   Talks & Interviews
92
             li
92
             li
93
                 h5
93
                 h5
94
-                    router-link(to="") Education 
94
+                    router-link(to="/guide") Education 
95
                     ul.f-col
95
                     ul.f-col
96
                         li
96
                         li
97
                             router-link(to="/guide")   Guides 
97
                             router-link(to="/guide")   Guides 
101
                             router-link(to="/page/library")   Library 
101
                             router-link(to="/page/library")   Library 
102
             li
102
             li
103
                 h5
103
                 h5
104
-                    router-link(to="") News 
104
+                    router-link(to="/blog") News 
105
                     ul.f-col
105
                     ul.f-col
106
                         li
106
                         li
107
                             router-link(to="/blog")   Blog Posts 
107
                             router-link(to="/blog")   Blog Posts 

+ 3
- 3
vue-theme/src/components/sidebars/events.vue View File

1
 <template lang="pug">
1
 <template lang="pug">
2
 //- most recent upcoming event - sidebar in events list - max=2?
2
 //- most recent upcoming event - sidebar in events list - max=2?
3
-h3.t-up {{ listType }} events
3
+h3.t-up events {{ listType }} 
4
 ul.t-up
4
 ul.t-up
5
     li(v-for="post in events")
5
     li(v-for="post in events")
6
         router-link(:to="`/event/${post.slug}`")
6
         router-link(:to="`/event/${post.slug}`")
28
     },
28
     },
29
     data() {
29
     data() {
30
         return {
30
         return {
31
-            listType: 'upcoming',
31
+            listType: 'current/upcoming',
32
         }
32
         }
33
     },
33
     },
34
     methods: {
34
     methods: {
40
                 {
40
                 {
41
                     sortType: sortTypes.currentAndUpcoming,
41
                     sortType: sortTypes.currentAndUpcoming,
42
                     params: {
42
                     params: {
43
-                        limit: 99,
43
+                        limit: 3,
44
                         page: 1
44
                         page: 1
45
                     }
45
                     }
46
                 }
46
                 }

+ 3
- 3
vue-theme/src/components/sidebars/exhibitions.vue View File

1
 <template lang="pug">
1
 <template lang="pug">
2
 //- most recent upcoming exhibition - sidebar in events list - max=2?
2
 //- most recent upcoming exhibition - sidebar in events list - max=2?
3
-h3.t-up {{ listType }} exhibitions
3
+h3.t-up exhibitions {{ listType }} 
4
 ul.t-up
4
 ul.t-up
5
     li(v-for="post in exhibitions")
5
     li(v-for="post in exhibitions")
6
         router-link(:to="`/exhibition/${post.slug}`")
6
         router-link(:to="`/exhibition/${post.slug}`")
28
     },
28
     },
29
     data() {
29
     data() {
30
         return {
30
         return {
31
-            listType: 'upcoming',
31
+            listType: 'current/upcoming',
32
         }
32
         }
33
     },
33
     },
34
     methods: {
34
     methods: {
40
                 {
40
                 {
41
                     sortType: sortTypes.currentAndUpcoming,
41
                     sortType: sortTypes.currentAndUpcoming,
42
                     params: {
42
                     params: {
43
-                        limit: 99,
43
+                        limit: 3,
44
                         page: 1
44
                         page: 1
45
                     }
45
                     }
46
                 }
46
                 }

+ 4
- 4
vue-theme/src/components/sidebars/sidebar.vue View File

3
     section
3
     section
4
         //- if not single layout with sorting
4
         //- if not single layout with sorting
5
         .shadow(v-if="shouldShowListSort.includes(type) && layout !== 'single'")
5
         .shadow(v-if="shouldShowListSort.includes(type) && layout !== 'single'")
6
-            h3.t-up sort {{ type }}
6
+            h3.t-up sort {{ type }}s
7
             ul.t-up
7
             ul.t-up
8
                 li 
8
                 li 
9
                     //- post?type=articles //
9
                     //- post?type=articles //
52
         
52
         
53
         //- if {{type}} has sorted by-material show material sets
53
         //- if {{type}} has sorted by-material show material sets
54
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
54
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
55
-            h3.t-up {{ type }} by material
55
+            h3.t-up {{ type }}s by material
56
             ul.t-up
56
             ul.t-up
57
                 li
57
                 li
58
                     template(v-for="material in materials") 
58
                     template(v-for="material in materials") 
61
 
61
 
62
         //- if {{type}} has sorted by-episode show episode sets           
62
         //- if {{type}} has sorted by-episode show episode sets           
63
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
63
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
64
-            h3.t-up {{ type }} by episode  
64
+            h3.t-up {{ type }}s by episode  
65
             ul.t-up
65
             ul.t-up
66
                 li.f-row.start.wrap
66
                 li.f-row.start.wrap
67
                     template(v-for="episodeSet in episodeSets") 
67
                     template(v-for="episodeSet in episodeSets") 
70
 
70
 
71
         //- if {{type}} has sorted by-type show subtype sets           
71
         //- if {{type}} has sorted by-type show subtype sets           
72
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
72
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
73
-            h3.t-up {{ type }} type  
73
+            h3.t-up {{ type }}s type  
74
             ul.t-up
74
             ul.t-up
75
                 li
75
                 li
76
                     template(v-for="subtypeSet in subtypeSets") 
76
                     template(v-for="subtypeSet in subtypeSets") 

+ 1
- 1
vue-theme/src/pages/list.vue View File

8
                 h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }}&nbsp;
8
                 h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }}&nbsp;
9
                 h3(v-else) Search results for: {{$route.query.s }}&nbsp;
9
                 h3(v-else) Search results for: {{$route.query.s }}&nbsp;
10
                 span(v-if="sortBy")
10
                 span(v-if="sortBy")
11
-                    h3 {{ sortBy.replace('-', ' ') }}
11
+                    h3 {{ sortBy.replace(/\-/g, ' ')}} 
12
 
12
 
13
             h3(v-if="!loaded") loading...
13
             h3(v-if="!loaded") loading...
14
             .content(
14
             .content(

+ 3
- 2
vue-theme/src/pages/mixin-post-types.js View File

80
                 post.type == 'page' && post.slug == 'community-craft-calendar' || 
80
                 post.type == 'page' && post.slug == 'community-craft-calendar' || 
81
                 post.type == 'page' && post.slug == 'video-resources-for-educators' || 
81
                 post.type == 'page' && post.slug == 'video-resources-for-educators' || 
82
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
82
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
83
-                post.type == 'page' && post.slug == 'mailing-list' 
83
+                post.type == 'page' && post.slug == 'mailing-list' ||
84
+                post.type == 'page' && post.slug == 'handwork-celebrating-american-craft-2026' 
85
+
84
                 
86
                 
85
             ) { 
87
             ) { 
86
                 json.text = post.title 
88
                 json.text = post.title 
87
             }
89
             }
88
-           
89
             // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
90
             // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
90
             return json
91
             return json
91
         },
92
         },

+ 1
- 1
vue-theme/src/utils/helpers.js View File

3
     return type.charAt(0).toUpperCase() + type.slice(1)
3
     return type.charAt(0).toUpperCase() + type.slice(1)
4
 }
4
 }
5
 
5
 
6
-const materials = ['clay', 'fiber', 'glass', 'metal', 'paper', 'wood']
6
+const materials = ['clay', 'fiber', 'glass', 'metal', 'paper', 'wood', 'other']
7
 
7
 
8
 const sortTypes = {
8
 const sortTypes = {
9
     alpha: 'by-alpha',
9
     alpha: 'by-alpha',

Loading…
Cancel
Save