Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d9f2ea8
added in banner
joeygaitan Oct 18, 2019
5b9b800
added in some css for the login components. Now working on merging th…
joeygaitan Oct 18, 2019
e7ff97a
Addding in changes from master
joeygaitan Oct 18, 2019
cfce798
added in webpack to fix the autofill feature that changes the backgro…
joeygaitan Oct 18, 2019
64c511d
added in api url
joeygaitan Oct 21, 2019
cfc1a9d
added in addition information. Make a link to the user signup page
joeygaitan Oct 21, 2019
a7eab2d
[upd] gitignore
noltron000 Oct 23, 2019
f483193
fixed png working
joeygaitan Oct 23, 2019
4aced4d
Merge branch 'loginAndSignUp' of https://github.com/Calcumon/Calcumon…
joeygaitan Oct 23, 2019
9541de0
[fmt] configuring indentation (2 spaces)
noltron000 Oct 23, 2019
a167d7b
[fix] logo sizing
noltron000 Oct 23, 2019
086c448
[fix] font format issues
noltron000 Oct 23, 2019
4e131d8
[fmt] configuring indentation (2 spaces)
noltron000 Oct 23, 2019
601e4b3
[upd] main logo arrangement
noltron000 Oct 23, 2019
b60f41c
Auth reworks I made
joeygaitan Oct 24, 2019
1899ae1
adding in nolans current css modifications to branch
joeygaitan Oct 24, 2019
f9ad8d6
working on getting this handleSignIn working
joeygaitan Oct 24, 2019
085b39f
fixed fetch request bug. Probably fixed cors error
joeygaitan Oct 24, 2019
0b08ac5
addedin successful login and signup fetch calls, now working on addin…
joeygaitan Oct 24, 2019
e94d1c3
added in working login and signup
joeygaitan Oct 24, 2019
a3328f4
reading response data now
joeygaitan Oct 25, 2019
b7fffbe
adding in the logout to the Autenicated route, so log out will be in …
joeygaitan Oct 25, 2019
76a59b7
Log out bug
joeygaitan Oct 28, 2019
bc57cb4
fixed up bugs login Signup and signOut reducers
joeygaitan Oct 28, 2019
1985686
history change
joeygaitan Oct 28, 2019
b1e50f1
AuthenticatedRoute can use logOut action
Oct 28, 2019
031a8f6
merge
Oct 28, 2019
3c61e5b
added in update login. Still working on login
joeygaitan Oct 29, 2019
fd052b9
added in update
joeygaitan Oct 29, 2019
ac1b2e0
added in some changes
joeygaitan Oct 30, 2019
59f25b5
pusing up changes
joeygaitan Oct 30, 2019
949b8ec
added new interface for DispatchProps
joeygaitan Oct 30, 2019
f211a52
up to date changes
joeygaitan Oct 30, 2019
4dedbb0
added almost working authenticated routes
joeygaitan Nov 1, 2019
fff34e8
added in working login for login component. Now working on modifiying…
joeygaitan Nov 11, 2019
ce58c02
added in session storage
joeygaitan Nov 14, 2019
5074e44
added in project
joeygaitan Nov 19, 2019
7a089bc
added in some more changes to logOut
joeygaitan Nov 19, 2019
cf1058f
added in some changes to auth
joeygaitan Nov 19, 2019
c1c0b14
added in working logOut component
joeygaitan Nov 19, 2019
583aa83
Revert "added in working logOut component"
joeygaitan Nov 19, 2019
0774221
added in changes
joeygaitan Nov 19, 2019
6c5a34e
merging loginRegister branch
AnniePawl Nov 19, 2019
60103a9
working on login styles
AnniePawl Nov 19, 2019
652b250
updating login and registration styles
AnniePawl Nov 20, 2019
1a75908
added new banners, restyled inputs and buttons
AnniePawl Nov 20, 2019
e85a6cf
v2 ready for merge
AnniePawl Nov 20, 2019
1b5709d
added and formatted limbs svg
AnniePawl Nov 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="logo192.png" />
<!--

<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="logo192.png" />
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700&display=swap"
rel="stylesheet">
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -24,12 +24,13 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>React App</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -39,5 +40,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
41 changes: 20 additions & 21 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,56 @@ import './App.css';
// Redux connection

// Components
// import SignUp from './components/Signup/index'
import Login from './components/Login/index'
import Signup from './components/Signup/index'
import Dashboard from './components/landingPage/index'

//This is for authenicated route
import AuthenicatedRoute from './highOrderComponents/AuthenicatedRoute';

import reducers from './reducers';
import Signup from './components/Signup';
const store = createStore(reducers)

{/* TODO: Add after login form is moved out of landing page: <Route path ='/login' component={Login}/> */}
{/* TODO: Add after login form is moved out of landing page: <Route path ='/login' component={Login}/> */ }

//add logout to authenitacted routes

interface Props{
interface Props {

}

interface appState{
interface appState {
mover: Boolean
}
export default class App extends React.Component<Props, appState> {
constructor(props: Props){
constructor(props: Props) {
super(props)
this.state ={
this.state = {
mover: false
}
}



render(){
render() {
console.log("hello", this.state.mover)
console.log("inside else condition location", this.state.mover)
console.log("inside else condition location", this.state.mover)
return (
<Provider store={store} >
<Router>
<div>
<Switch>
<Route exact path ='/' component={ Login }/>
<Route path = '/signup' component = { Signup }/>
{/* TODO: user={"Add variable from redux store"} */}

{/* <AuthenicatedRoute pending={false} path='/Dashboard' user={true} component={ Dashboard } /> */}
<Route path = '/Dashboard' component={ Dashboard }/>
{/* <AuthenicatedRoute pending={false} path='/Dashboard' user={true} component={ () => <h1>Hello Test</h1> } /> */}
</Switch>
</div>
<div>
<Switch>
<Route exact path='/' component={Login} />
<Route path='/signup' component={Signup} />
{/* TODO: user={"Add variable from redux store"} */}

{/* <AuthenicatedRoute pending={false} path='/Dashboard' user={true} component={ Dashboard } /> */}
<Route path='/Dashboard' component={Dashboard} />
{/* <AuthenicatedRoute pending={false} path='/Dashboard' user={true} component={ () => <h1>Hello Test</h1> } /> */}
</Switch>
</div>
</Router>
</Provider>
);
}
}
}
Binary file removed src/assets/Banners/Calcumon-Banner1.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/assets/Banners/limbs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/Banners/login_banner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/Banners/register_banner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading