From 4ea4c30e29438791d18a1c14ab9be9669821e651 Mon Sep 17 00:00:00 2001 From: Toni Dezman Date: Fri, 25 Aug 2017 08:20:40 +0200 Subject: [PATCH] extracts route magic strings to routes constants --- app/javascript/packs/app/routes.js | 10 ++++++++++ .../packs/src/settings/components/MainNav.jsx | 20 +++++++++++++------ .../components/account/SettingsAccount.jsx | 11 ++++++++-- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/app/javascript/packs/app/routes.js b/app/javascript/packs/app/routes.js index 373db2b32..4306a206b 100644 --- a/app/javascript/packs/app/routes.js +++ b/app/javascript/packs/app/routes.js @@ -1,6 +1,16 @@ +export const ROOT_PATH = "/"; + // activities export const ACTIVITIES_PATH = "/client_api/activities"; +// settings +export const SETTINGS_PATH = "/settings"; +export const SETTINGS_ACCOUNT_PATH = "/settings/account"; +export const SETTINGS_TEAMS_PATH = "/settings/teams"; +export const SETTINGS_ACCOUNT_PROFILE_PATH = "/settings/account/profile"; +export const SETTINGS_ACCOUNT_PREFERENCES_PATH = + "/settings/account/preferences"; + // teams export const TEAMS_PATH = "/client_api/teams"; export const CHANGE_TEAM_PATH = "/client_api/change_team"; diff --git a/app/javascript/packs/src/settings/components/MainNav.jsx b/app/javascript/packs/src/settings/components/MainNav.jsx index a875b129d..5efd85c92 100644 --- a/app/javascript/packs/src/settings/components/MainNav.jsx +++ b/app/javascript/packs/src/settings/components/MainNav.jsx @@ -5,7 +5,15 @@ import { Nav, NavItem } from "react-bootstrap"; import { FormattedMessage } from "react-intl"; import Navigation from "../../../shared/navigation"; -import { SETTINGS_ACCOUNT_PROFILE, SETTINGS_TEAMS } from "../../../app/routes"; +import { + ROOT_PATH, + SETTINGS_PATH, + SETTINGS_ACCOUNT_PATH, + SETTINGS_TEAMS_PATH, + SETTINGS_ACCOUNT_PROFILE, + SETTINGS_TEAMS, + SETTINGS_ACCOUNT_PROFILE_PATH +} from "../../../app/routes"; import NotFound from "../../../shared/404/NotFound"; import SettingsAccount from ".././components/account/SettingsAccount"; @@ -50,14 +58,14 @@ export default class MainNav extends Component { - + } + path={SETTINGS_PATH} + render={() => } /> - - + + diff --git a/app/javascript/packs/src/settings/components/account/SettingsAccount.jsx b/app/javascript/packs/src/settings/components/account/SettingsAccount.jsx index df4390839..ee46d6253 100644 --- a/app/javascript/packs/src/settings/components/account/SettingsAccount.jsx +++ b/app/javascript/packs/src/settings/components/account/SettingsAccount.jsx @@ -7,6 +7,10 @@ import SettingsProfile from "./profile/SettingsProfile"; import SettingsPreferences from "./preferences/SettingsPreferences"; import { BORDER_LIGHT_COLOR } from "../../../../app/constants/colors"; +import { + SETTINGS_ACCOUNT_PREFERENCES_PATH, + SETTINGS_ACCOUNT_PROFILE_PATH +} from "../../../../app/routes"; const Wrapper = styled.div` background: white; @@ -25,9 +29,12 @@ class SettingsAccount extends Component { - +