Skip to content

Commit ab7ea5f

Browse files
lautiamkoklautiamkok
committed
Updated code
1 parent 09da8e7 commit ab7ea5f

File tree

8 files changed

+185
-181
lines changed

8 files changed

+185
-181
lines changed

‎1.nuxt/3.cross-domains/3.connect-php/1.wordpress/pages/projects/[slug].vue

+15-8
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,38 @@
77
v-html="post.post_content"
88
/>
99

10+
<h3>
11+
Post Carousels
12+
</h3>
1013
<ul>
1114
<li v-for="carousel in post.carousels" v-bind:key="carousel.id">
12-
<h3>
15+
<h3 v-if="carousel.title">
1316
{{ carousel.title }}
1417
</h3>
15-
<div
18+
<div
19+
v-if="carousel.description"
1620
v-html="carousel.description"
1721
/>
1822

1923
<ul>
20-
<li v-for="image in carousel.images" v-bind:key="image.id">
24+
<li v-for="asset in carousel.assets" v-bind:key="asset.id">
2125
<img
22-
:alt="image.title"
23-
:src="useAsset(image.data.sizes.medium.url)"
26+
:alt="asset.title || null"
27+
:src="useAsset(asset.sizes.medium.url)"
2428
/>
2529
</li>
2630
</ul>
2731
</li>
2832
</ul>
2933

34+
<h3>
35+
Post Assets
36+
</h3>
3037
<ul>
31-
<li v-for="image in post.images" v-bind:key="image.id">
38+
<li v-for="asset in post.assets" v-bind:key="asset.id">
3239
<img
33-
:alt="image.title"
34-
:src="useAsset(image.data.sizes.medium.url)"
40+
:alt="asset.title || null"
41+
:src="useAsset(asset.sizes.medium.url)"
3542
/>
3643
</li>
3744
</ul>

‎4.php/1.wordpress/advanced-nuxtjs-course-wordpress.sql

+102-142
Large diffs are not rendered by default.

‎4.php/1.wordpress/wp-content/themes/bareboneapi-v1/inc/api/project/get/one.php

+44-10
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,56 @@ function fetch_project ($data) {
3737
$post->carousels = carbon_get_post_meta($post->ID, 'carousels');
3838
if (count((array)$post->carousels) > 0) {
3939
foreach ($post->carousels as $key => &$carousel) {
40-
$carousel['description'] = wpautop($carousel['description']);
41-
if (count($carousel['images']) > 0) {
42-
foreach ($carousel['images'] as $key => &$image) {
43-
$image['description'] = wpautop($image['description']);
44-
$image['data'] = get_image_data($image['id']);
40+
if ($carousel['_type'] === 'gallery') {
41+
foreach ($carousel['gallery'] as $key => &$asset) {
42+
$asset_id = $asset;
43+
$asset = get_asset_data($asset_id);
44+
$asset['id'] = $asset_id;
45+
}
46+
$carousel['assets'] = $carousel['gallery'];
47+
unset($carousel['gallery']);
48+
}
49+
if ($carousel['_type'] === 'assets') {
50+
foreach ($carousel['assets'] as $key => &$asset) {
51+
$asset['caption'] = wpautop($asset['caption'] ?? '');
52+
$asset = array_merge($asset, get_asset_data($asset['id']));
53+
}
54+
}
55+
if ($carousel['_type'] === 'complex') {
56+
$carousel['description'] = wpautop($carousel['description']);
57+
if (count($carousel['assets']) > 0) {
58+
// Only take the first item from the array.
59+
$carousel['assets'] = $carousel['assets'][0];
60+
unset($carousel['assets'][0]);
61+
62+
// Set asset data.
63+
if ($carousel['assets']['_type'] === 'complex') {
64+
foreach ($carousel['assets']['complex'] as $key => &$asset) {
65+
$asset['caption'] = wpautop($asset['caption'] ?? '');
66+
$asset = array_merge($asset, get_asset_data($asset['id']));
67+
}
68+
$carousel['assets'] = $carousel['assets']['complex'];
69+
}
70+
if ($carousel['assets']['_type'] === 'gallery') {
71+
foreach ($carousel['assets']['gallery'] as $key => &$asset) {
72+
$asset_id = $asset;
73+
$asset = get_asset_data($asset_id);
74+
$asset['id'] = $asset_id;
75+
}
76+
$carousel['assets'] = $carousel['assets']['gallery'];
77+
}
78+
unset($carousel['assets']['_type']);
4579
}
4680
}
4781
}
4882
}
4983

5084
// Add images from carbon fields.
51-
$post->images = carbon_get_post_meta($post->ID, 'images');
52-
if (count((array)$post->images) > 0) {
53-
foreach ($post->images as $key => &$image) {
54-
$image['description'] = wpautop($image['description']);
55-
$image['data'] = get_image_data($image['id']);
85+
$post->assets = carbon_get_post_meta($post->ID, 'assets');
86+
if (count((array)$post->assets) > 0) {
87+
foreach ($post->assets as $key => &$asset) {
88+
$asset['caption'] = wpautop($asset['caption'] ?? '');
89+
$asset = array_merge($asset, get_asset_data($asset['id']));
5690
}
5791
}
5892

‎4.php/1.wordpress/wp-content/themes/bareboneapi-v1/inc/api/siteinfo.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@
1414
function create_siteinfo ($data) {
1515
$logo = carbon_get_theme_option('logo');
1616
if ($logo) {
17-
$logo = get_image_data(carbon_get_theme_option('logo'));
17+
$logo = get_asset_data(carbon_get_theme_option('logo'));
1818
}
1919

2020
$logos = carbon_get_theme_option('logos');
2121
if (count((array)$logos) > 0) {
2222
foreach ($logos as $key => &$image) {
23-
$image['data'] = get_image_data($image['id']);
23+
$image = array_merge($image, get_asset_data($image['id']));
2424
}
2525
}
2626

2727
$favicon = carbon_get_theme_option('favicon');
2828
if ($favicon) {
29-
$favicon = get_image_data(carbon_get_theme_option('favicon'));
29+
$favicon = get_asset_data(carbon_get_theme_option('favicon'));
3030
}
3131

3232
$open_graph = carbon_get_theme_option('open_graph');
3333
if ($open_graph) {
34-
$open_graph = reset(carbon_get_theme_option('open_graph'));
34+
$open_graph = reset($open_graph);
3535
}
3636

3737
$siteinfo = [

‎4.php/1.wordpress/wp-content/themes/bareboneapi-v1/inc/metabox/carbon-fields/fields/post-attributes.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ function crb_attach_post_meta_attributes() {
1616
]),
1717
])
1818

19-
->add_tab(__('Images'), [
20-
Field::make('complex', 'images', '')
21-
->set_help_text('Attach local images to this post. Meta ID: images.')
19+
->add_tab(__('Assets'), [
20+
Field::make('complex', 'assets', '')
21+
->set_help_text('Attach local assets to this post. Meta ID: assets.')
2222
->set_layout('tabbed-vertical')
23-
->add_fields(add_crb_asset_fields()),
23+
->add_fields(add_crb_asset_fields(['caption'])),
2424
])
2525

2626
->add_tab(__('Search Exclude'), [

‎4.php/1.wordpress/wp-content/themes/bareboneapi-v1/inc/util/utils.php

+14-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// Get the url of any attachment, image, file, video, etc.
77
// https://developer.wordpress.org/reference/functions/wp_get_attachment_url/
8-
function get_attachment_url($attachment_id) {
8+
function get_asset_url($attachment_id) {
99
return wp_get_attachment_url($attachment_id);
1010
}
1111

@@ -19,9 +19,9 @@ function get_image_url($attachment_id, $size = '') {
1919
return $data[0];
2020
}
2121

22-
// Get image data and its sizes.
22+
// Get asset (image, file, video, etc) data and its sizes (image only).
2323
// https://developer.wordpress.org/reference/functions/wp_get_attachment_metadata/
24-
function get_image_data($attachment_id) {
24+
function get_asset_data($attachment_id) {
2525
if (!$attachment_id) {
2626
return false;
2727
}
@@ -33,11 +33,18 @@ function get_image_data($attachment_id) {
3333

3434
// Push more keys to the data.
3535
$data['url'] = $uploads_baseurl . '/' . $data['file'];
36-
$data['mime_type'] = get_post_mime_type($attachment_id);
36+
$data['mime_type'] = $data['mime_type'] ?? get_post_mime_type($attachment_id);
3737

38-
// Push url key to the sizes.
39-
foreach($data['sizes'] as $key => &$size) {
40-
$size['url'] = $uploads_baseurl . '/' . $data['file'];
38+
// Push the `url` key to the sizes (image only).
39+
if ($data['sizes']) {
40+
foreach($data['sizes'] as $key => &$size) {
41+
// Change the 'mime-type' default to 'mime_type' so that it is
42+
// consistent with other assets, such as videos..
43+
$size['mime_type'] = $size['mime-type'];
44+
unset($size['mime-type']);
45+
46+
$size['url'] = $uploads_baseurl . '/' . $data['file'];
47+
}
4148
}
4249
return $data;
4350
}

‎5.graphql/2.wordpress/src/schema/Project.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const typeDefs = `
1717
1818
type Project {
1919
${post}
20-
images: [Attachment]
20+
assets: [Attachment]
2121
carousels: [Carousel]
2222
}
2323

‎5.graphql/2.wordpress/src/schema/extract/types.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ const attachment = `
1717
type Attachment {
1818
id: String
1919
${note}
20-
data: AttachmentData
21-
}
22-
23-
type AttachmentData {
2420
${attachmentAttributes}
2521
sizes: AttachmentSizes
2622
}
@@ -38,7 +34,7 @@ const attachment = `
3834
const carousel = `
3935
type Carousel {
4036
${note}
41-
images: [Attachment]
37+
assets: [Attachment]
4238
}
4339
`
4440

0 commit comments

Comments
 (0)