Skip to content

Commit

Permalink
Misc. variable/class names refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
ArunaTebel committed Oct 20, 2019
1 parent fa9a599 commit ac5a2a3
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import autosize from 'autosize';

const _ = require('lodash');

class EstimateEditComponent extends Component {
class ArchestEstimateEditComponent extends Component {

constructor(props) {
super(props);
Expand Down Expand Up @@ -169,4 +169,4 @@ class EstimateEditComponent extends Component {

}

export default EstimateEditComponent;
export default ArchestEstimateEditComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ArchestHttp from "../modules/archest_http";
import {HotTable} from '@handsontable/react'
import ArchestMainContainerComponent from "./ArchestMainContainerComponent";

class EstimateViewComponent extends Component {
class ArchestEstimateViewComponent extends Component {

constructor(props) {
super(props);
Expand Down Expand Up @@ -154,4 +154,4 @@ class EstimateViewComponent extends Component {

}

export default EstimateViewComponent;
export default ArchestEstimateViewComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ArchestMainContainerComponent from "./ArchestMainContainerComponent";

const _ = require('lodash');

class HomeComponent extends Component {
class ArchestHomeComponent extends Component {

constructor(props) {
super(props);
Expand Down Expand Up @@ -109,4 +109,4 @@ class HomeComponent extends Component {
}
}

export default HomeComponent;
export default ArchestHomeComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import ArchestHttp from "../modules/archest_http";
import ArchestAuth from "../modules/archest_auth";


class LoginComponent extends Component {
class ArchestLoginComponent extends Component {

constructor(props) {
super(props);
Expand Down Expand Up @@ -105,4 +105,4 @@ class LoginComponent extends Component {
}
}

export default LoginComponent;
export default ArchestLoginComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {Component} from "react";
import {LOCAL_STORAGE_TOKEN_KEY} from "../constants";


class LogoutComponent extends Component {
class ArchestLogoutComponent extends Component {

render() {
localStorage.removeItem(LOCAL_STORAGE_TOKEN_KEY);
Expand All @@ -15,4 +15,4 @@ class LogoutComponent extends Component {
}
}

export default LogoutComponent;
export default ArchestLogoutComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {Navbar, Nav, OverlayTrigger, Tooltip} from "react-bootstrap";

const _ = require('lodash');

class NavbarComponent extends Component {
class ArchestNavbarComponent extends Component {

render() {
if (!_.includes(PATHS_WITH_NO_NAVBAR, this.props.location.pathname)) {
Expand Down Expand Up @@ -41,4 +41,4 @@ class NavbarComponent extends Component {
}
}

export default withRouter(NavbarComponent);
export default withRouter(ArchestNavbarComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ArchestMainContainerComponent from "./ArchestMainContainerComponent";

const _ = require('lodash');

class PhaseEstimatesComponent extends Component {
class ArchestPhaseEstimatesComponent extends Component {

constructor(props) {
super(props);
Expand Down Expand Up @@ -223,4 +223,4 @@ class PhaseEstimatesComponent extends Component {
}
}

export default PhaseEstimatesComponent;
export default ArchestPhaseEstimatesComponent;
37 changes: 17 additions & 20 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,36 @@ import './res/archest-default-theme/index.scss';
import './res/icons/font/css/open-iconic-bootstrap.scss';
import '../node_modules/handsontable/dist/handsontable.full.min.css';
import * as serviceWorker from './serviceWorker';
import HomeComponent from "./components/home";
import LoginComponent from "./components/login";
import LogoutComponent from "./components/logout";
import {BrowserRouter as Router, Route} from "react-router-dom";
import NavbarComponent from "./components/navbar";
import PhaseEstimatesComponent from "./components/phase_estimates";
import EstimateViewComponent from "./components/estimate_view";
import EstimateEditComponent from "./components/estimate_edit";
import ArchestHomeComponent from "./components/ArchestHomeComponent";
import ArchestLoginComponent from "./components/ArchestLoginComponent";
import ArchestLogoutComponent from "./components/ArchestLogoutComponent";
import ArchestNavbarComponent from "./components/ArchestNavbarComponent";
import ArchestPhaseEstimatesComponent from "./components/ArchestPhaseEstimatesComponent";
import ArchestEstimateViewComponent from "./components/ArchestEstimateViewComponent";
import ArchestEstimateEditComponent from "./components/ArchestEstimateEditComponent";
import ArchestEstimateProgressComponent from "./components/ArchestEstimateProgressComponent";
import TimelineComponent from "./components/ArchestTimelineComponent.js";
import ArchestTimelineComponent from "./components/ArchestTimelineComponent.js";
import ArchestCalendarComponent from "./components/ArchestCalendarComponent";

ReactDOM.render(
<Router>
<div>
<NavbarComponent/>
<ArchestNavbarComponent/>

<Route path="/" exact component={HomeComponent}/>
<Route path="/home" component={HomeComponent}/>
<Route path="/timeline" component={TimelineComponent}/>
<Route path="/" exact component={ArchestHomeComponent}/>
<Route path="/home" component={ArchestHomeComponent}/>
<Route path="/timeline" component={ArchestTimelineComponent}/>
<Route path="/calendar" component={ArchestCalendarComponent}/>
<Route path="/phase/:phaseId/estimates/" component={PhaseEstimatesComponent}/>
<Route path="/estimates/:estimateId/view/" component={EstimateViewComponent}/>
<Route path="/estimates/:estimateId/edit/" component={EstimateEditComponent}/>
<Route path="/phase/:phaseId/estimates/" component={ArchestPhaseEstimatesComponent}/>
<Route path="/estimates/:estimateId/view/" component={ArchestEstimateViewComponent}/>
<Route path="/estimates/:estimateId/edit/" component={ArchestEstimateEditComponent}/>
<Route path="/estimates/:estimateId/progress/" component={ArchestEstimateProgressComponent}/>
<Route path="/login/" component={LoginComponent}/>
<Route path="/logout/" component={LogoutComponent}/>
<Route path="/login/" component={ArchestLoginComponent}/>
<Route path="/logout/" component={ArchestLogoutComponent}/>
</div>
</Router>,
document.getElementById('root'),
);

// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();

0 comments on commit ac5a2a3

Please sign in to comment.