Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit c943272

Browse files
committed
Cleanup for non-signed in
1 parent 40a8bf5 commit c943272

2 files changed

Lines changed: 25 additions & 17 deletions

File tree

src/components/calendar_widget/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,14 @@ export default class CalendarWidget extends Component {
119119
}, () => this.listCalendars());
120120
}
121121

122-
render({}, {calendars, events, loadingEvents}) {
122+
render({signedIn}, {calendars, events, loadingEvents}) {
123123
return (
124124
<div>
125125
<h1>Сегодня <CollapseWidget onClick={(collapsed) => this.setState({collapsed})} /></h1>
126-
<div class={this.state.collapsed ? style.hide : null}>
126+
127+
{ !signedIn ? (<div>Сначала надо залогиниться</div>) : '' }
128+
129+
<div class={!signedIn || this.state.collapsed ? style.hide : null}>
127130

128131
<div class={this.state.calendarId ? style.hide : '' }>
129132
{ !calendars.length ? (<LoadingPart noText="true" />) : '' }

src/components/photos_widget/index.js

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,27 +183,32 @@ export default class PhotosWidget extends Component {
183183
return this.state.selectedAlbum && this.state.selectedAlbum.id;
184184
}
185185

186-
render() {
186+
render({signedIn}, {}) {
187187
return (
188188
<div class={this.isSelectedAlbumHasId() ? 'selected' : ''}>
189-
<h1 class={this.state.collapsed ? style.collapse_after : null}>
189+
<h1>
190190
{this.state.selectedAlbum && this.state.selectedAlbum.title ? this.state.selectedAlbum.title : 'Фото'}
191191
<CollapseWidget onClick={(collapsed) => this.setState({collapsed})} />
192192
</h1>
193-
<div class={this.isSelectedAlbumHasId() ? style.hide : ''}>
194-
<p>Выберите альбомы для слайдшоу:</p>
195-
{ !this.state.albums.length ? (<LoadingPart noText="true" />) : '' }
196-
{
197-
this.state.albums.map((album) => <PhotosWidgetAlbum onClick={() => this.onAlbumSelected(album)} album={album} /> )
198-
}
199-
</div>
200193

201-
<div class={!this.isSelectedAlbumHasId() ? style.hide : ''}>
202-
<PhotosWidgetPhotos photo={this.state.randomPic} isIOS={this.isIOS}></PhotosWidgetPhotos>
203-
</div>
204-
<div class={!this.isSelectedAlbumHasId() ? style.hide : style.selectOther}>
205-
<span onClick={() => this.selectOther()}>Выбрать другой альбом</span>
206-
<span onClick={() => this.selectRandomPicFromState()}>Следующая фотография</span>
194+
{ !signedIn ? (<div>Сначала надо залогиниться</div>) : '' }
195+
196+
<div class={!signedIn || this.state.collapsed ? style.hide : null}>
197+
<div class={this.isSelectedAlbumHasId() ? style.hide : ''}>
198+
<p>Выберите альбомы для слайдшоу:</p>
199+
{ !this.state.albums.length ? (<LoadingPart noText="true" />) : '' }
200+
{
201+
this.state.albums.map((album) => <PhotosWidgetAlbum onClick={() => this.onAlbumSelected(album)} album={album} /> )
202+
}
203+
</div>
204+
205+
<div class={!this.isSelectedAlbumHasId() ? style.hide : ''}>
206+
<PhotosWidgetPhotos photo={this.state.randomPic} isIOS={this.isIOS}></PhotosWidgetPhotos>
207+
</div>
208+
<div class={!this.isSelectedAlbumHasId() ? style.hide : style.selectOther}>
209+
<span onClick={() => this.selectOther()}>Выбрать другой альбом</span>
210+
<span onClick={() => this.selectRandomPicFromState()}>Следующая фотография</span>
211+
</div>
207212
</div>
208213
</div>
209214
);

0 commit comments

Comments
 (0)