-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
1 parent
4f0052b
commit 2d8a73f
Showing
78 changed files
with
7,084 additions
and
6,871 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
Oops, something went wrong.