Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added background to onboarding page #25

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12,119 changes: 8,261 additions & 3,858 deletions client/package-lock.json

Large diffs are not rendered by default.

14 changes: 2 additions & 12 deletions client/src/components/ChatHeader.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
import { useCookies} from "react-cookie"
import { useNavigate } from 'react-router-dom'


const ChatHeader = ({user}) => {
const [cookies, setCookie, removeCookie] = useCookies(['user'])
let navigate = useNavigate()

const logout = () => {
removeCookie('UserId', cookies.UserId)
removeCookie('AuthToken', cookies.AuthToken)
navigate('/')
window.location.reload()
}



return (
<div className="chat-container-header">
<div className="profile">
Expand All @@ -21,7 +12,6 @@ const ChatHeader = ({user}) => {
</div>
<h3>{user.first_name}</h3>
</div>
<i className="log-out-icon" onClick={logout}>⇦</i>
</div>
)
}
Expand Down
24 changes: 24 additions & 0 deletions client/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,23 @@ nav .logo-container .logo {
width: 100%
}

/* onboarding page background */
.wrapper {
width: 100%;
height: 120%;
position: absolute;
background: linear-gradient(45deg,#F17C58, #E94584, #fba226 ,#FD297B,#FF655B,#ffb618);
background-size: 600% 100%;
animation: gradient 16s linear infinite;
animation-direction: alternate;
}
@keyframes gradient {
0% {background-position: 0%}
100% {background-position: 100%}
}



/*-----Dashboard Page -----*/


Expand Down Expand Up @@ -304,6 +321,13 @@ nav .logo-container .logo {
padding: 10px;
}

.logout-icon{
display: flex;
justify-content:flex-end;
width: 97%;
cursor: pointer;
}


/*------Chat Container ------*/

Expand Down
11 changes: 10 additions & 1 deletion client/src/pages/Dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,21 @@ import {useEffect, useState} from "react"
import { useCookies} from "react-cookie"
import ChatContainer from '../components/ChatContainer'
import axios from "axios"
import { useNavigate } from "react-router-dom"

const Dashboard = () => {
const [user, setUser] = useState(null)
const [genderedUsers, setGenderedUsers] = useState(null)
const [lastDirection, setLastDirection] = useState()
const [cookies, setCookie, removeCookie] = useCookies(['user'])
let navigate = useNavigate()

const logout = () => {
removeCookie('UserId', cookies.UserId)
removeCookie('AuthToken', cookies.AuthToken)
navigate('/')
window.location.reload()
}


const userId = cookies.UserId
Expand Down Expand Up @@ -94,8 +103,8 @@ const Dashboard = () => {
<div className="dashboard">
<ChatContainer user={user}/>
<div className="swipe-container">
<div className="logout-icon"><i className="log-out-icon" onClick={logout}>⇦</i></div>
<div className="card-container">

{filteredGenderedUsers?.map((genderedUser) =>
<TinderCard className='swipe'
key={genderedUser.user_id}
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/OnBoarding.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const OnBoarding = () => {
showModal={false}

/>
<div className="onboarding">
<div className="onboarding wrapper">
<h2>Create Account</h2>

<form onSubmit={handleSubmit}>
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion server/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
# /node_modules
/.pnp
.pnp.js

Expand Down
2 changes: 1 addition & 1 deletion server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const jwt = require('jsonwebtoken')
const cors = require('cors')
const bcrypt = require('bcrypt')
const {google}=require('googleapis');
const uri = 'mongodb://localhost:27017'
const uri = 'mongodb://0.0.0.0:27017'


const app = express()
Expand Down
15 changes: 0 additions & 15 deletions server/node_modules/.bin/color-support

This file was deleted.

12 changes: 12 additions & 0 deletions server/node_modules/.bin/color-support

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

17 changes: 17 additions & 0 deletions server/node_modules/.bin/color-support.cmd

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

28 changes: 28 additions & 0 deletions server/node_modules/.bin/color-support.ps1

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

15 changes: 0 additions & 15 deletions server/node_modules/.bin/mime

This file was deleted.

12 changes: 12 additions & 0 deletions server/node_modules/.bin/mime

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

17 changes: 17 additions & 0 deletions server/node_modules/.bin/mime.cmd

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

28 changes: 28 additions & 0 deletions server/node_modules/.bin/mime.ps1

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

15 changes: 0 additions & 15 deletions server/node_modules/.bin/mkdirp

This file was deleted.

12 changes: 12 additions & 0 deletions server/node_modules/.bin/mkdirp

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

17 changes: 17 additions & 0 deletions server/node_modules/.bin/mkdirp.cmd

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

28 changes: 28 additions & 0 deletions server/node_modules/.bin/mkdirp.ps1

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

15 changes: 0 additions & 15 deletions server/node_modules/.bin/node-pre-gyp

This file was deleted.

12 changes: 12 additions & 0 deletions server/node_modules/.bin/node-pre-gyp

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

Loading