Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
rename actions/actionTypes
  • Loading branch information
thabti committed Aug 1, 2016
commit 6b53f2361f70e900e7db429e0b711a6c30e2a94d
4 changes: 2 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import debug from './src/helpers/debug';

import Html from './src/helpers/Html';

import { setUserAgent } from './src/redux/actions/audioPlayerActions.js';
import { setOption } from './src/redux/actions/optionsActions.js';
import { setUserAgent } from './src/redux/actions/audioplayer.js';
import { setOption } from './src/redux/actions/options.js';

// Use varnish for the static routes, which will cache too
server.use(raven.middleware.express.requestHandler(config.sentryServer));
Expand Down
2 changes: 1 addition & 1 deletion src/components/Audioplayer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import { camelize } from 'humps';

// Redux
import * as AudioActions from '../../redux/actions/audioPlayerActions';
import * as AudioActions from '../../redux/actions/audioplayer';

// Components
import Track from './Track';
Expand Down
2 changes: 1 addition & 1 deletion src/components/FontStyles/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux';
import { fontFaceStyle, fontFaceStyleLoaded } from '../../helpers/buildFontFaces';
import { load } from 'redux/actions/fontFaceActions.js';
import { load } from 'redux/actions/fontFace.js';

import debug from 'helpers/debug';
import selector from './selector';
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { connect } from 'react-redux';

import debug from '../../helpers/debug';

import { isAllLoaded, loadAll } from '../../redux/actions/surahsActions.js';
import { isAllLoaded, loadAll } from '../../redux/actions/surahs.js';

const styles = require('./style.scss');

Expand Down
2 changes: 1 addition & 1 deletion src/containers/Search/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Header from './Header';
import Ayah from '../../components/Ayah';
import CoreLoader from '../../components/Loader';

import { search } from '../../redux/actions/searchActions.js';
import { search } from '../../redux/actions/search.js';

const style = require('./style.scss');

Expand Down
4 changes: 2 additions & 2 deletions src/containers/Surah/connect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import {
isAllLoaded,
loadAll,
setCurrent as setCurrentSurah
} from '../../redux/actions/surahsActions.js';
} from '../../redux/actions/surahs.js';

import {
clearCurrent,
isLoaded,
load as loadAyahs
} from '../../redux/actions/ayahsActions.js';
} from '../../redux/actions/ayahs.js';

import debug from 'helpers/debug';

Expand Down
6 changes: 3 additions & 3 deletions src/containers/Surah/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ import descriptions from './descriptions';

import { surahsConnect, ayahsConnect } from './connect';

import * as AudioActions from '../../redux/actions/audioPlayerActions.js';
import * as AyahActions from '../../redux/actions/ayahsActions.js';
import * as OptionsActions from '../../redux/actions/optionsActions.js';
import * as AudioActions from '../../redux/actions/audioplayer.js';
import * as AyahActions from '../../redux/actions/ayahs.js';
import * as OptionsActions from '../../redux/actions/options.js';

const style = require('./style.scss');

Expand Down
95 changes: 0 additions & 95 deletions src/redux/actions/AudioPlayerActions.js

This file was deleted.

75 changes: 0 additions & 75 deletions src/redux/actions/AyahsActions.js

This file was deleted.

8 changes: 0 additions & 8 deletions src/redux/actions/FontFaceActions.js

This file was deleted.

23 changes: 0 additions & 23 deletions src/redux/actions/OptionsActions.js

This file was deleted.

95 changes: 0 additions & 95 deletions src/redux/actions/audioPlayerActions.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
SET_CURRENT_AYAH,
SET_CURRENT_WORD,
CLEAR_CURRENT_WORD

} from '../constants/ayahsActionTypes.js';
} from '../constants/ayahs.js';

// For safe measure
const defaultOptions = {
Expand Down Expand Up @@ -68,8 +67,8 @@ export function setCurrentWord(id) {

export function isLoaded(globalState, surahId, from, to) {
return (
globalState.ayahs.entities[surahId] &&
globalState.ayahs.entities[surahId][`${surahId}:${from}`] &&
globalState.ayahs.entities[surahId][`${surahId}:${to}`]
globalState.ayahs.entities[surahId] &&
globalState.ayahs.entities[surahId][`${surahId}:${from}`] &&
globalState.ayahs.entities[surahId][`${surahId}:${to}`]
);
}
Loading