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

README.md

@@ -66,7 +66,7 @@ Make sure `IS_DEV` is set to `true`. This is important.
 
 Currently the API uses `localhost`. This should be changed in production. 
 
-Set your directory owner to `www-data` with `docker exec -it craft-vue chown -R www-data:www-data ./wp-content` so your Wordpress container can write files
+Set your directory owner to `www-data` with `docker exec -it craft-wp chown -R www-data:www-data ./wp-content` so your Wordpress container can write files
 
 Lastly, run `npm run dev` to start the development server. 
 
@@ -77,15 +77,15 @@ If successful, it will tell you that it is running on `http://localhost:8081`
 Setup a staging server and initialize a bare git repo in the `/opt` directory
 
 ```
-git init --bare /opt/staging/craft-vue.git
+git init --bare /opt/staging/vue-wp.git
 ```
 
-Copy over the `post-receive` script from `./deployment` to `/opt/staging/craft-vue.git/hooks` and make it executable with the command `chmod ug+x /opt/staging/craft-vue.git/hooks/post-receive`
+Copy over the `post-receive` script from `./deployment` to `/opt/staging/vue-wp.git/hooks` and make it executable with the command `chmod ug+x /opt/staging/vue-wp.git/hooks/post-receive`
 
 On your development machine, add the staging server as a remote...
 
 ```
-git remote add staging <user>@<server_ip>:/opt/staging/craft-vue.git 
+git remote add staging <user>@<server_ip>:/opt/staging/vue-wp.git 
 ```
 
 When you are ready to get your app to the new server, run `git push && git push staging` and things will get pulled and built on the staging server. Sweet!
@@ -100,9 +100,9 @@ Included is a drone config, and some recommended steps to build.
 
 You also need to setup a `post-receive` hook on the host server.
 
-* On your *development* machine, add the target host as a remote `git remote add </opt/staging/craf-vue.git> staging master`
-* Login to the *remote* machine and setup a bare git repo on `git init --bare </opt/staging/craf-vue.git>`
-* Copy the `post-receive` hook file into the `</opt/staging/craf-vue.git/hooks/>` directory
+* On your *development* machine, add the target host as a remote `git remote add </opt/staging/vue-wp.git> staging master`
+* Login to the *remote* machine and setup a bare git repo on `git init --bare </opt/staging/vue-wp.git>`
+* Copy the `post-receive` hook file into the `</opt/staging/vue-wp.git/hooks/>` directory
 
 :question_mark: Misc
 --------------------

plugins/cia-post-types/cia-post-types.php

@@ -93,4 +93,3 @@ add_action( 'cmb2_admin_init', 'cmb2_episode_credits_metaboxes' );
 add_action( 'cmb2_admin_init', 'cmb2_event_date_metaboxes' );
 add_action( 'cmb2_admin_init', 'cmb2_exhibition_date_metaboxes' );
 
-/* Plugin Logic -- END * /

vue-theme/src/components/footer.vue

@@ -3,150 +3,140 @@
     footer.main.w-max.f-row.between
         ul.f-col.t-cntr
             //- address contact   
-            li
+            li 
                 h4 Craft in America
-                    ul
-                        h5
-                            li 8415 W. Third St.
-                            li Los Angeles, CA 90048
-                            li Tues–Sat, 12PM–6PM
-                            li (310) 659-9022 office
-                            li (323) 951-0610 center
-                            li
-                                router-link(to="mailto:info@craftinamerica.org") info@craftinamerica.org
-            //- social media   
+            li 8415 W. Third St.
+            li Los Angeles, CA 90048
+            li Tues–Sat, 12PM–6PM
+            li (310) 659-9022 office
+            li (323) 951-0610 center
             li
-                h4 Connect with Us
-                <br>
+                router-link(to="mailto:info@craftinamerica.org") info@craftinamerica.org 
+            <br>
+            //- social media   
+            li 
+                h4 Connect with Us 
                 ul.f-row
                     li
-                        a(href="http://www.youtube.com/user/craftinamerica")
+                        a(href="http://www.youtube.com/user/craftinamerica" aria-label="Youtube Link")
                             svg(aria-hidden="true" focusable="false" data-icon="youtube" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512")
                                 path(fill="currentColor" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z")
                     li 
-                        a(href="https://www.facebook.com/CraftinAmerica")
-                            //- img(src="../assets/facebook-brands.svg")
-                            //- replace with respective icon 
+                        a(href="https://www.facebook.com/CraftinAmerica" aria-label="FaceBook Link")
                             svg(aria-hidden="true" focusable="false" data-icon="facebook" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512")
                                 path(fill="currentColor" d="M504 256C504 119 393 8 256 8S8 119 8 256c0 123.78 90.69 226.38 209.25 245V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.28c-30.8 0-40.41 19.12-40.41 38.73V256h68.78l-11 71.69h-57.78V501C413.31 482.38 504 379.78 504 256z")
                     li 
-                        a(href="http://www.instagram.com/craftinamerica")
+                        a(href="http://www.instagram.com/craftinamerica" aria-label="Instagram Link") 
                             svg(aria-hidden="true" focusable="false" data-icon="instagram" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 495")
                                 path(fill="currentColor" d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z")
                     li 
-                        a(href="https://twitter.com/CraftinAmerica")
+                        a(href="https://twitter.com/CraftinAmerica" aria-label="Twitter link") 
                             svg(aria-hidden="true" focusable="false" data-icon="twitter" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512")
                                 path(fill="currentColor" d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z")
                     li 
-                        a(href="https://www.tiktok.com/@craft_in_america")                                
+                        a(href="https://www.tiktok.com/@craft_in_america" aria-label="TikTok link") 
                             svg(aria-hidden="true" focusable="false" data-icon="tiktok" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 -50 448 600")
                                 path(fill="currentColor" d="M448,209.91a210.06,210.06,0,0,1-122.77-39.25V349.38A162.55,162.55,0,1,1,185,188.31V278.2a74.62,74.62,0,1,0,52.23,71.18V0l88,0a121.18,121.18,0,0,0,1.86,22.17h0A122.18,122.18,0,0,0,381,102.39a121.43,121.43,0,0,0,67,20.14Z")
-                li
-                    <br>
-                        a(href="https://visitor.r20.constantcontact.com/d.jsp?llr=fyb4y9cab&p=oi&m=fyb4y9cab&sit=olvymhdeb&f=ee3616e1-10de-4a59-b451-1a882111b1f5", target="_blank") Join our email list
+            //- mailing list   
+            li
+                <br>
+                    a(href="https://visitor.r20.constantcontact.com/d.jsp?llr=fyb4y9cab&p=oi&m=fyb4y9cab&sit=olvymhdeb&f=ee3616e1-10de-4a59-b451-1a882111b1f5" aria-label="Mailing List link" target="_blank") Join our email list 
                             
         //- menu links
         ul.f-col
             li
-                h5 
-                    router-link(to="/episode") PBS Series
-                    ul.f-col.start 
-                        li 
-                            router-link(to="/episode") &nbsp; Episodes
-                        li 
-                            router-link(to="/short") &nbsp; Shorts
-                        li 
-                            router-link(to="/technique") &nbsp; Techniques
+                router-link(to="/episode") PBS Series
+                ul.f-col.start 
+                    li 
+                        router-link(to="/episode") &nbsp; Episodes
+                    li 
+                        router-link(to="/short") &nbsp; Shorts
+                    li 
+                        router-link(to="/technique") &nbsp; Techniques
             li 
-                h5
-                    router-link(to="/artist") Artists
-                    ul.f-col
-                        li
-                            router-link(to="/artist/sorted/by-alpha") &nbsp; A-Z
-                        li
-                            router-link(to="/artist/sorted/by-material") &nbsp; by Material
+                router-link(to="/artist") Artists
+                ul.f-col
+                    li
+                        router-link(to="/artist/sorted/by-alpha") &nbsp; A-Z
+                    li
+                        router-link(to="/artist/sorted/by-material") &nbsp; by Material
             li
-                h5 
-                    router-link(to="/exhibition") Exhibitions
-                    ul.f-col
-                        li
-                            router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
-                        li
-                            router-link(to="/exhibition/sorted/by-past") &nbsp; Past
+                router-link(to="/exhibition") Exhibitions
+                ul.f-col
+                    li
+                        router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
+                    li
+                        router-link(to="/exhibition/sorted/by-past") &nbsp; Past
             li
-                h5
-                    router-link(to="/page/center") Center 
-                    ul.f-col
-                        li
-                            router-link(to="/page/center") &nbsp; Info
-                        li 
-                            router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events 
-                        li
-                            //- router-link(to="/event?type=talks") &nbsp; Talks &amp; Interviews
-                            router-link(to="/page/recorded-talks-and-interviews") &nbsp; Recorded Talks + Interviews
-                        li 
-                            router-link(to="/page/library") &nbsp; Library 
+                router-link(to="/page/center") Center 
+                ul.f-col
+                    li
+                        router-link(to="/page/center") &nbsp; Info
+                    li 
+                        router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events 
+                    li
+                        //- router-link(to="/event?type=talks") &nbsp; Talks &amp; Interviews
+                        router-link(to="/page/recorded-talks-and-interviews") &nbsp; Recorded Talks + Interviews
+                    li 
+                        router-link(to="/page/library") &nbsp; Library 
             li
-                h5
-                    router-link(to="/guide") Education 
-                    ul.f-col
-                        li
-                            router-link(to="/guide") &nbsp; Guides 
-                        li
-                            router-link(to="/page/video-resources-for-educators") &nbsp; Video Resources 
-                        li
-                            router-link(to="/page/craft-in-schools") &nbsp; Craft in Schools  
+                router-link(to="/guide") Education 
+                ul.f-col
+                    li
+                        router-link(to="/guide") &nbsp; Guides 
+                    li
+                        router-link(to="/page/video-resources-for-educators") &nbsp; Video Resources 
+                    li
+                        router-link(to="/page/craft-in-schools") &nbsp; Craft in Schools  
             li
-                h5    
-                    router-link(to="/page/artists-resources") Resources
-                    ul.f-col  
-                        li
-                            router-link(to="/publication") &nbsp; Publications 
-                        li
-                            router-link(to="/object") &nbsp; Explore Craft Objects
-                        li
-                            router-link(to="/page/artists-resources") &nbsp; Opportunities
-                        li
-                            router-link(to="/artist/sorted/by-type") &nbsp; Organizations and Institutions 
-                        li
-                            router-link(to="/page/craft-resources-map") &nbsp; Craft Resources Map 
-                        li
-                            router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar 
+                router-link(to="/page/artists-resources") Resources
+                ul.f-col  
+                    li
+                        router-link(to="/publication") &nbsp; Publications 
+                    li
+                        router-link(to="/object") &nbsp; Explore Craft Objects
+                    li
+                        router-link(to="/page/artists-resources") &nbsp; Opportunities
+                    li
+                        router-link(to="/artist/sorted/by-type") &nbsp; Organizations and Institutions 
+                    li
+                        router-link(to="/page/craft-resources-map") &nbsp; Craft Resources Map 
+                    li
+                        router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar 
+                    li 
+                        a(href="https://www.craftvideodictionary.org" aria-label="Craft Video Dictionary Website link" target="_blank") &nbsp; Craft Video Dictionary                             
             li
-                h5    
-                    router-link(to="/page/donate") Support
-                    ul.f-col  
-                        li
-                            router-link(to="/page/donate") &nbsp; Donate
-                        li
-                            router-link(to="/page/shop") &nbsp; Shop 
+                router-link(to="/page/donate") Support
+                ul.f-col  
+                    li
+                        router-link(to="/page/donate") &nbsp; Donate
+                    li
+                        router-link(to="/page/shop") &nbsp; Shop 
             li
-                h5
-                    router-link(to="/blog") News 
-                    ul.f-col
-                        li
-                            router-link(to="/blog") &nbsp; Blog Posts 
-                        li 
-                            router-link(to="/posts?type=articles") &nbsp; In the News 
-                        li 
-                            router-link(to="/posts?type=releases") &nbsp; Press Releases 
-                        li 
-                            router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar  
+                router-link(to="/blog") News 
+                ul.f-col
+                    li
+                        router-link(to="/blog") &nbsp; Blog Posts 
+                    li 
+                        router-link(to="/posts?type=articles") &nbsp; In the News 
+                    li 
+                        router-link(to="/posts?type=releases") &nbsp; Press Releases 
+                    li 
+                        router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar  
             li
-                h5
-                    router-link(to="/page/about") About 
-                    ul.f-col
-                        li
-                            router-link(to="/page/about") &nbsp; Craft in America 
-                        li 
-                            router-link(to="/page/board") &nbsp; Board of Directors 
-                        li 
-                            router-link(to="/page/staff") &nbsp; Staff 
-                        li 
-                            router-link(to="/page/contact") &nbsp; Contact   
+                router-link(to="/page/about") About 
+                ul.f-col
+                    li
+                        router-link(to="/page/about") &nbsp; Craft in America 
+                    li 
+                        router-link(to="/page/board") &nbsp; Board of Directors 
+                    li 
+                        router-link(to="/page/staff") &nbsp; Staff 
+                    li 
+                        router-link(to="/page/contact") &nbsp; Contact   
 
-    .sub-footer.f-col.start
-        h6 Craft in America &copy; 2010 &ndash; {{ today }} 
+    .sub-footer.f-col.start.t-cntr
+        h6 CRAFT IN AMERICA, Inc. is a Los Angeles-based 501(c)(3) non-profit organization  &nbsp;  &nbsp; &copy; 2010 &ndash; {{ today }} 
         //- actually the bottom of the page
 
 </template>
@@ -178,7 +168,7 @@ export default {
         // ALL <ul> tags
         ul
             > li
-                width: 100%
+                width: 100% 
         // OUTER <ul> tags
         > ul
             padding: $ms-0

vue-theme/src/components/navigation/navigation.vue

@@ -5,17 +5,9 @@ nav.main.w-max
         ul.f-row.w-max
             li.f-row.start
                 router-link(to="/")
-                    img(src="../../star.svg")
+                    img(aria-label="home button logo" src="../../star.svg")
                 router-link(to="/")
                     h1.t-serif craft in america
-            //- li.f-grow
-            //- li(v-for="item in menuItems")
-            //-     router-link(v-if="['event','exhibition'].includes(item)" :to="`/${item}/sorted/${sortTypes.currentAndUpcoming}`")
-            //-         h5.t-up {{ item }}
-            //-     router-link(v-else-if="['artist'].includes(item)" :to="`/${item}/sorted/${sortTypes.alpha}`")
-            //-         h5.t-up {{ item }}
-            //-     router-link(v-else :to="`/${item}`")
-            //-         h5.t-up {{ item }}
 
             //- hardcoded menu
             li.f-grow
@@ -29,14 +21,14 @@ nav.main.w-max
                     li
                         router-link(to="/technique") Techniques
             li.f-grow
-                router-link(to="/artist/sorted/by-material") Artists
+                router-link(to="/artist/") Artists
                 ul.submenu
                     li
                         router-link(to="/artist/sorted/by-alpha") A - Z
                     li
                         router-link(to="/artist/sorted/by-material") By Material
             li.f-grow 
-                router-link(to="/exhibition/sorted/by-current-and-upcoming") Exhibitions
+                router-link(to="/exhibition/") Exhibitions
                 ul.submenu 
                     li
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
@@ -77,6 +69,10 @@ nav.main.w-max
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
                     li
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
+                    li 
+                        a(href="https://www.craftvideodictionary.org" target="_blank") Craft Video Dictionary Website
+
+             
             li.f-grow    
                 router-link(to="/page/donate") Support
                 ul.submenu 
@@ -105,7 +101,7 @@ nav.main.w-max
     .mobile-menu
         .f-row.start
             router-link(to="/")
-                img(src="../../star.svg")
+                img(aria-label="home button logo" src="../../star.svg" )
             router-link(to="/")
                 h1.t-serif.t-up craft in america