Skip to content

Commit

Permalink
Code Refactor (#67)
Browse files Browse the repository at this point in the history 
* phase2 patial ----- 2 (#66)

* added description to the video url field in project creation form issue #50 (#61)

* new deployment changes (#62)

* increased pagination limit from 6 to 20 (#63)

* phase2 patial ----- 2 (#65)

switched handling of ssl back to valian/docker-nginx-auto-ssl

* Issue #54: switched from class based views to function based views, moved styles to seprate files and changed the general structure of the project to be more intuitive

* more refactoring

* more refactor -- added new prettier rules and prettified more files not being covered by prettier initially
  • Loading branch information
@NdibeRaymond
NdibeRaymond authored Jan 20, 2021
1 parent 4f0052b commit 2d8a73f
Show file tree
Hide file tree
Showing 78 changed files with 7,084 additions and 6,871 deletions.
10 changes: 10 additions & 0 deletions zubhub_frontend/zubhub/.prettierrc.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
printWidth: 80
tabWidth: 2
useTabs: false
semi: true
singleQuote: true
trailingComma: all
bracketSpacing: true
jsxBracketSameLine: false
arrowParens: avoid
requirePragma: false
6 changes: 6 additions & 0 deletions zubhub_frontend/zubhub/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion zubhub_frontend/zubhub/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@testing-library/react": "^11.1.2",
"@testing-library/user-event": "^12.2.2",
"aws-sdk": "^2.813.0",
"classnames": "^2.2.6",
"date-fns": "^2.16.1",
"formik": "^2.2.5",
"nanoid": "^3.1.20",
Expand All @@ -32,7 +33,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"pretty": "prettier --config ./.prettierrc.yaml --write \"src/**/*.{js,jsx}\""
},
"eslintConfig": {
"extends": [
Expand All @@ -51,5 +53,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"prettier": "2.2.1"
}
}
38 changes: 0 additions & 38 deletions zubhub_frontend/zubhub/src/App.css
View file

This file was deleted.

258 changes: 139 additions & 119 deletions zubhub_frontend/zubhub/src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,126 +1,146 @@
import React,{Component} from 'react';

import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
import PageWrapper from './components/PageWrapper';

import {withAPI} from './components/api';

import Signup from './components/pages/user_auth/Signup';
import Login from './components/pages/user_auth/Login';
import PasswordReset from './components/pages/user_auth/PasswordReset';
import PasswordResetConfirm from './components/pages/user_auth/PasswordResetConfirm';
import EmailConfirm from './components/pages/user_auth/EmailConfirm';
import Profile from './components/pages/profile/Profile';
import UserProjects from './components/pages/profile/profile_components/UserProjects';
import UserFollowers from './components/pages/profile/profile_components/UserFollowers';
import Projects from './components/pages/projects/Projects';
import SavedProjects from './components/pages/projects/projects_components/SavedProjects';
import CreateProject from './components/pages/projects/projects_components/CreateProject';
import ProjectDetails from './components/pages/projects/projects_components/ProjectDetails';

class App extends Component {

render(){
return(
import React from 'react';

import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';

import { withAPI } from './api';

import PageWrapper from './views/PageWrapper';
import Signup from './views/signup/Signup';
import Login from './views/login/Login';
import PasswordReset from './views/password_reset/PasswordReset';
import PasswordResetConfirm from './views/password_reset_confirm/PasswordResetConfirm';
import EmailConfirm from './views/email_confirm/EmailConfirm';
import Profile from './views/profile/Profile';
import UserProjects from './views/user_projects/UserProjects';
import UserFollowers from './views/user_followers/UserFollowers';
import Projects from './views/projects/Projects';
import SavedProjects from './views/saved_projects/SavedProjects';
import CreateProject from './views/create_project/CreateProject';
import ProjectDetails from './views/project_details/ProjectDetails';

function App(props) {
return (
<Router>
<Switch>

<Route
exact={true}
path="/"
render={props=>(
<PageWrapper {...props}>
<Projects {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/signup"
render={props=>(
<PageWrapper {...props}>
<Signup {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/login"
render={props=>(
<PageWrapper {...props}>
<Login {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/password-reset"
render={props=>(
<PageWrapper {...props}>
<PasswordReset {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/password-reset-confirm"
render={props=>(
<PageWrapper {...props}>
<PasswordResetConfirm {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/email-confirm"
render={props=>(
<PageWrapper {...props}>
<EmailConfirm {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/creators/:username/projects"
render={props=>(
<PageWrapper {...props}>
<UserProjects {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/creators/:username/followers"
render={props=>(
<PageWrapper>
<UserFollowers {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/creators/:username"
render={props=>(
<PageWrapper {...props}>
<Profile {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/profile"
render={props=>(
<PageWrapper {...props}>
<Profile {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/projects/create"
render={props=>(
<PageWrapper {...props}>
<CreateProject {...props} {...this.props}/>
</PageWrapper>
)}/>

<Route path="/projects/saved"
render={props=>(
<PageWrapper>
<SavedProjects {...props} {...this.props}/>
</PageWrapper>
)}/>
<Route path="/projects/:id"
render={props=>(
<PageWrapper {...props}>
<ProjectDetails {...props} {...this.props}/>
</PageWrapper>
)}/>
<Route
exact={true}
path="/"
render={routeProps => (
<PageWrapper {...routeProps}>
<Projects {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/signup"
render={routeProps => (
<PageWrapper {...routeProps}>
<Signup {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/login"
render={routeProps => (
<PageWrapper {...routeProps}>
<Login {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/password-reset"
render={routeProps => (
<PageWrapper {...routeProps}>
<PasswordReset {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/password-reset-confirm"
render={routeProps => (
<PageWrapper {...routeProps}>
<PasswordResetConfirm {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/email-confirm"
render={routeProps => (
<PageWrapper {...routeProps}>
<EmailConfirm {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/creators/:username/projects"
render={routeProps => (
<PageWrapper {...routeProps}>
<UserProjects {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/creators/:username/followers"
render={routeProps => (
<PageWrapper {...routeProps}>
<UserFollowers {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/creators/:username"
render={routeProps => (
<PageWrapper {...routeProps}>
<Profile {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/profile"
render={routeProps => (
<PageWrapper {...routeProps}>
<Profile {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/projects/create"
render={routeProps => (
<PageWrapper {...routeProps}>
<CreateProject {...routeProps} {...props} />
</PageWrapper>
)}
/>

<Route
path="/projects/saved"
render={routeProps => (
<PageWrapper {...routeProps}>
<SavedProjects {...routeProps} {...props} />
</PageWrapper>
)}
/>
<Route
path="/projects/:id"
render={routeProps => (
<PageWrapper {...routeProps}>
<ProjectDetails {...routeProps} {...props} />
</PageWrapper>
)}
/>
</Switch>

</Router>
);
}
}

export default withAPI(App)
export default App;
Loading

0 comments on commit 2d8a73f

Please sign in to comment.