moved files to app/ folder

This commit is contained in:
zmagod 2017-08-09 15:21:02 +02:00
parent 7630f6af3d
commit 790ae9d685
13 changed files with 24 additions and 14 deletions

View file

@ -1,6 +1,6 @@
import axios from "axios";
import { ACTIVITIES_PATH } from "../../app/routes";
import { GLOBAL_ACTIVITIES_DATA } from "./types";
import { GLOBAL_ACTIVITIES_DATA } from "../../app/action_types";
function addActivitiesData(data) {
return {

View file

@ -1,7 +1,7 @@
import axios from "axios";
import _ from "lodash";
import { TEAMS_PATH, CHANGE_TEAM_PATH } from "../../app/routes";
import { GET_LIST_OF_TEAMS, SET_CURRENT_TEAM } from "./types";
import { GET_LIST_OF_TEAMS, SET_CURRENT_TEAM } from "../../app/action_types";
function addTeamsData(data) {
return {

View file

@ -1,6 +1,6 @@
import axios from "axios";
import { CURRENT_USER_PATH } from "../../app/routes";
import { SET_CURRENT_USER } from "./types";
import { SET_CURRENT_USER } from "../../app/action_types";
function addCurrentUser(data) {
return {

View file

@ -0,0 +1,13 @@
import React from 'react';
const NotificationImage = ({type_of}) => {
return(
<div className="text-center">
<span className="assignment">
<i className="fa fa-newspaper-o" />
</span>
</div>
)
}
export default NotificationImage;

View file

@ -5,6 +5,7 @@ import { FormattedTime } from "react-intl";
import styled from "styled-components";
import CustomNavItem from "./CustomNavItem";
import NotificationImage from "./NotificationImage";
const StyledListItem = styled(CustomNavItem)`
border-bottom: 1px solid #d2d2d2;
@ -19,11 +20,7 @@ const NotificationItem = ({ notification }) => {
<StyledListItem>
<Row>
<Col xs={2}>
<div className="text-center">
<span className="assignment">
<i className="fa fa-newspaper-o" />
</span>
</div>
<NotificationImage type={type_of} />
</Col>
<Col xs={10}>

View file

@ -9,7 +9,7 @@ import {
MAIN_COLOR_BLUE,
WILD_SAND_COLOR,
MYSTIC_COLOR
} from "../../constants/colors";
} from "../../../app/constants/colors";
import NotificationItem from "./NotificationItem";
import Spinner from "../../Spinner";

View file

@ -6,7 +6,7 @@ import { NavDropdown, MenuItem, Glyphicon } from "react-bootstrap";
import styled from "styled-components";
import _ from "lodash";
import { BORDER_GRAY_COLOR } from "../../constants/colors";
import { BORDER_GRAY_COLOR } from "../../../app/constants/colors";
import { setCurrentUser, changeTeam } from "../../actions/TeamsActions";
import { getTeamsList } from "../../actions/TeamsActions";

View file

@ -7,7 +7,7 @@ import {
MAIN_COLOR_BLUE,
WHITE_COLOR,
BORDER_GRAY_COLOR
} from "../constants/colors";
} from "../../app/constants/colors";
import { getActivities } from "../actions/ActivitiesActions";
import TeamSwitch from "./components/TeamSwitch";
import GlobalActivitiesModal from "./components/GlobalActivitiesModal";

View file

@ -1,7 +1,7 @@
import {
GLOBAL_ACTIVITIES_DATA,
MORE_GLOBAL_ACTIVITIES
} from "../actions/types";
} from "../../app/action_types";
export function globalActivities(
state = { more: true, activities: [] },

View file

@ -1,4 +1,4 @@
import { SET_CURRENT_TEAM, GET_LIST_OF_TEAMS } from "../actions/types";
import { SET_CURRENT_TEAM, GET_LIST_OF_TEAMS } from "../../app/action_types";
const initialState = { name: "", id: 0, current_team: true };
export const setCurrentTeam = (state = initialState, action) => {

View file

@ -1,4 +1,4 @@
import { SET_CURRENT_USER } from "../actions/types";
import { SET_CURRENT_USER } from "../../app/action_types";
export function currentUser(
state = { id: 0, fullName: "", avatarPath: "" },