Skip to content

Refactoring Waiting Panel #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josercarmo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactoring Waiting Panel #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions LibVisWeb/LibVisWeb/ClientApp/components/Article.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import ShowCategories from './ShowCategories';
import ShowArticleAction from './ShowArticleAction';
import { toastr } from 'react-redux-toastr';
import { IncludeActionWithFile, ActionFile } from '../models/Article';
import WaitPanel from './common/WaitPanel';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
const editPng: string = require('../theme/newspaper/img/edit.png');
const deletePng: string = require('../theme/newspaper/img/delete.png');

Expand Down Expand Up @@ -369,9 +369,7 @@ class Article extends React.Component<ArticleProps, {}> {

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleCategory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import Footer from './footer/Footer';
import Header from './header/Header';
import { ArticleModel } from 'ClientApp/models/Article';
import ShowArticle from './ShowArticle';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleCategoryProps =
AccountStore.AccountState
Expand Down Expand Up @@ -100,9 +99,7 @@ class ArticleCategory extends React.Component<ArticleCategoryProps, {}> {

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import ErrorMsg from '../message/errormsg';
import Footer from './footer/Footer';
import Header from './header/Header';
import ShowArticle from './ShowArticle';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListProps =
AccountStore.AccountState
Expand Down Expand Up @@ -78,9 +77,7 @@ class ArticleList extends React.Component<ArticleListProps, {}> {

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListApproval.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import ErrorMsg from '../message/errormsg';
import Footer from './footer/Footer';
import Header from './header/Header';
import ShowArticleRef from './ShowArticleRef';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListApprovalProps =
AccountStore.AccountState
Expand Down Expand Up @@ -90,9 +89,7 @@ class ArticleListApproval extends React.Component<ArticleListApprovalProps, {}>

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListNarration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import Header from './header/Header';
import ShowArticle from './ShowArticle';
import ShowArticleRef from './ShowArticleRef';
import { routerActions } from 'react-router-redux';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListNarrationProps =
AccountStore.AccountState
Expand Down Expand Up @@ -97,9 +96,7 @@ class ArticleListNarration extends React.Component<ArticleListNarrationProps, {}

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListProduction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import Header from './header/Header';
import ShowArticle from './ShowArticle';
import ShowArticleRef from './ShowArticleRef';
import { routerActions } from 'react-router-redux';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListProductionProps =
AccountStore.AccountState
Expand Down Expand Up @@ -97,9 +96,7 @@ class ArticleListProduction extends React.Component<ArticleListProductionProps,

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListPublish.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import Header from './header/Header';
import ShowArticle from './ShowArticle';
import ShowArticleRef from './ShowArticleRef';
import { routerActions } from 'react-router-redux';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListPublishProps =
AccountStore.AccountState
Expand Down Expand Up @@ -101,9 +100,7 @@ class ArticleListPublish extends React.Component<ArticleListPublishProps, {}> {

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListRevision.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import Header from './header/Header';
import ShowArticle from './ShowArticle';
import ShowArticleRef from './ShowArticleRef';
import { routerActions } from 'react-router-redux';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ArticleListRevisionProps =
AccountStore.AccountState
Expand Down Expand Up @@ -97,9 +96,7 @@ class ArticleListRevision extends React.Component<ArticleListRevisionProps, {}>

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
6 changes: 2 additions & 4 deletions LibVisWeb/LibVisWeb/ClientApp/components/ArticleListTranslation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import Header from './header/Header';
import ShowArticle from './ShowArticle';
import ShowArticleRef from './ShowArticleRef';
import { routerActions } from 'react-router-redux';
import WaitPanel from './common/WaitPanel';

const waitGif: string = require('../theme/newspaper/img/wait.gif');

type ArticleListTranslationProps =
AccountStore.AccountState
Expand Down Expand Up @@ -97,9 +97,7 @@ class ArticleListTranslation extends React.Component<ArticleListTranslationProps

<Header />

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="container open-line"></div>

Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/EditArticleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import * as ArticleModel from '../models/Article';
import * as ArticleStore from '../store/Article';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type EditArticleBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -294,9 +293,7 @@ class EditArticleForm extends React.Component<InjectedEditArticleFormProps, {}>

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/EditTargetForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import * as NewsModel from '../models/News';
import { ChangeTargetModel } from '../models/Target';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type EditTargetBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -207,9 +206,7 @@ class EditTargetForm extends React.Component<InjectedEditTargetFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/EditVideoForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import * as VideoModel from '../models/Video';
import * as VideoStore from '../store/Video';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type EditVideoBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -205,9 +204,7 @@ class EditVideoForm extends React.Component<InjectedEditVideoFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ManageUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import * as AccountStore from '../store/Account';
import * as AccountModel from '../models/Account';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ManageUserBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -122,9 +121,7 @@ class ManageUserForm extends React.Component<InjectedManageUserFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/ManageUsersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { SearchArticleModel } from 'ClientApp/models/Article';
import ShowArticleRef from './ShowArticleRef';
import { SearchUserModel } from 'ClientApp/models/Account';
import ShowUserRef from './ShowUserRef';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type ManageUserBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -173,9 +172,7 @@ class ManageUsersForm extends React.Component<InjectedSearchUserFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/NewArticleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import * as ArticleModel from '../models/Article';
import * as ArticleStore from '../store/Article';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type NewArticleBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -337,9 +336,7 @@ class NewArticleForm extends React.Component<InjectedNewArticleFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/NewTargetForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import * as TargetStore from '../store/Target';
import { NewTargetModel } from '../models/Target';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type NewTargetBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -248,9 +247,7 @@ class NewTargetForm extends React.Component<InjectedNewTargetFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/NewVideoForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import * as VideoStore from '../store/Video';
import { NewVideoModel } from '../models/Video';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type NewVideoBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -227,9 +226,7 @@ class NewVideoForm extends React.Component<InjectedNewVideoFormProps, {}> {

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/SearchArticleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'
import { SearchArticleModel } from 'ClientApp/models/Article';
import ShowArticleRef from './ShowArticleRef';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type SearchArticleBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -175,9 +174,7 @@ class SearchArticleForm extends React.Component<InjectedSearchArticleFormProps,

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
7 changes: 2 additions & 5 deletions LibVisWeb/LibVisWeb/ClientApp/components/SearchTargetForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import { NewTargetModel, SearchTargetModel } from '../models/Target';
import { routerActions } from 'react-router-redux';
import * as Toastr from 'react-redux-toastr'
import ShowTargetRef from './ShowTargetRef';

const waitGif: string = require('../theme/newspaper/img/wait.gif');
import WaitPanel from './common/WaitPanel';

type SearchTargetBaseProps =
AccountStore.AccountState
Expand Down Expand Up @@ -174,9 +173,7 @@ class SearchTargetForm extends React.Component<InjectedSearchTargetFormProps, {}

<div className="vc_column wpb_column vc_column_container tdc-column td-pb-span12">

<div className={(!this.contentReady ? "wait-panel" : "wait-panel-disabled")}>
<img src={waitGif} ></img>
</div>
<WaitPanel isContentReady={this.contentReady} />

<div className="wpb_wrapper">
<div className="td-pb-border-top">
Expand Down
Loading