From 58a87bdda0eb2ab8d128b19c39d3287db7387b9b Mon Sep 17 00:00:00 2001 From: ajmaley Date: Wed, 5 Dec 2018 17:31:40 -0500 Subject: [PATCH 1/3] Fixing Gallery bug --- src/components/FlameLinkCollectionGallery.js | 36 +++++++++++++++++--- src/components/RenderGallery.js | 2 ++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/components/FlameLinkCollectionGallery.js b/src/components/FlameLinkCollectionGallery.js index 77860ea..47d4300 100644 --- a/src/components/FlameLinkCollectionGallery.js +++ b/src/components/FlameLinkCollectionGallery.js @@ -16,14 +16,28 @@ const styles = theme => ({ }, flamelinkGallery: { - marginRight: "auto", - marginLeft: "auto", + marginRight: 'auto', + marginLeft: 'auto', + backgroundImage: 'url(../images/galleryBackgroundImage.png)', + overflow: 'hidden', + minHeight: 300, + minWidth: 300, + width: 'auto', + height: 'auto', }, flamelinkGalleryContainer: { backgroundColor: 'black', marginTop: 20, }, + flamelinkGalleryInnerContainer: { + maxHeight: 1000, + minHeight: 250, + height: 'auto', + width: 'auto', + marginRight: 'auto', + marginLeft: 'auto', + }, }); class FlameLinkCollectionGallery extends Component { @@ -43,6 +57,10 @@ class FlameLinkCollectionGallery extends Component { break; } } + + state = { + active: false, + } constructor(props) { super(props); @@ -51,7 +69,7 @@ class FlameLinkCollectionGallery extends Component { schemaDetails: '', schemaContent: '', schemaDescription: '', - } + }; flamelinkApp.schemas.getFields(this.props.galleryName, { fields: ['title', 'key', 'type', 'gridColumns', 'description', 'options'] }) .then(result => this.setState({ @@ -74,6 +92,10 @@ class FlameLinkCollectionGallery extends Component { this.getPageTitle(this.props.galleryName); } + toggleClass = () => { + this.setState(state => ({ active: !state.active })); + } + getGalleryInfo(schemaDetails, schemaContent) { var key; var mediaNums = []; @@ -111,8 +133,12 @@ class FlameLinkCollectionGallery extends Component { {this.state.schemaDescription} - - + + +
+ +
+
diff --git a/src/components/RenderGallery.js b/src/components/RenderGallery.js index ce87837..fc316b8 100644 --- a/src/components/RenderGallery.js +++ b/src/components/RenderGallery.js @@ -12,6 +12,7 @@ class RenderGallery extends Component { showIndex: true, showBullets: true, mounted: false, + autoPlay: true, } } @@ -31,6 +32,7 @@ class RenderGallery extends Component { showIndex={this.state.showIndex} showBullets={this.state.showBullets} onImageLoad={this._onImageLoad} + autoPlay={this.state.autoPlay} /> ); } From bebd42aa3ae54ca700a94daeae690562c5937601 Mon Sep 17 00:00:00 2001 From: ajmaley Date: Wed, 5 Dec 2018 17:32:07 -0500 Subject: [PATCH 2/3] All image --- src/images/galleryBackgroundImage.png | Bin 0 -> 6749 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/images/galleryBackgroundImage.png diff --git a/src/images/galleryBackgroundImage.png b/src/images/galleryBackgroundImage.png new file mode 100644 index 0000000000000000000000000000000000000000..7e9bebca4734a5a17346fce678eb4012043e5e9f GIT binary patch literal 6749 zcmeAS@N?(olHy`uVBq!ia0y~y;ILs}V6os}0*WLwpG*Z(jKx9jP7LeL$-D$|SkfJR z9T^xl_H+M9WCij$3p^r=85sBugD~Uq{1qt-43eKbT^vIy;@%!)ub_V4S5cv=QW9Pgg&ebxsLQ0QS5gV*mgE literal 0 HcmV?d00001 From 163121b22ed3631da2409fda51fb48dce93a534d Mon Sep 17 00:00:00 2001 From: ajmaley Date: Wed, 5 Dec 2018 20:35:45 -0500 Subject: [PATCH 3/3] Gallery not recovering from slow network bug fix --- src/components/FlameLinkCollectionGallery.js | 16 ++++------------ src/components/RenderGallery.js | 6 ++---- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/components/FlameLinkCollectionGallery.js b/src/components/FlameLinkCollectionGallery.js index 47d4300..6f9f7bc 100644 --- a/src/components/FlameLinkCollectionGallery.js +++ b/src/components/FlameLinkCollectionGallery.js @@ -20,7 +20,7 @@ const styles = theme => ({ marginLeft: 'auto', backgroundImage: 'url(../images/galleryBackgroundImage.png)', overflow: 'hidden', - minHeight: 300, + minHeight: 180, minWidth: 300, width: 'auto', height: 'auto', @@ -32,7 +32,7 @@ const styles = theme => ({ }, flamelinkGalleryInnerContainer: { maxHeight: 1000, - minHeight: 250, + minHeight: 180, height: 'auto', width: 'auto', marginRight: 'auto', @@ -57,10 +57,6 @@ class FlameLinkCollectionGallery extends Component { break; } } - - state = { - active: false, - } constructor(props) { super(props); @@ -92,10 +88,6 @@ class FlameLinkCollectionGallery extends Component { this.getPageTitle(this.props.galleryName); } - toggleClass = () => { - this.setState(state => ({ active: !state.active })); - } - getGalleryInfo(schemaDetails, schemaContent) { var key; var mediaNums = []; @@ -134,8 +126,8 @@ class FlameLinkCollectionGallery extends Component { - -
+ +
diff --git a/src/components/RenderGallery.js b/src/components/RenderGallery.js index fc316b8..5a06f1f 100644 --- a/src/components/RenderGallery.js +++ b/src/components/RenderGallery.js @@ -9,10 +9,9 @@ class RenderGallery extends Component { this.state = { showThumbnails: false, - showIndex: true, - showBullets: true, mounted: false, autoPlay: true, + slideInterval: 6000, } } @@ -29,10 +28,9 @@ class RenderGallery extends Component { ); }