Skip to content

Commit

Permalink
Fixed Settings routes and styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@mateoglzc
mateoglzc committed Jun 17, 2022
1 parent 23a24d3 commit 4223cae
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 105 deletions.
21 changes: 9 additions & 12 deletions amazon-solution/src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ import UserManagement from './views/Dashboard/components/UserManagement.js'
import AssignVideos from './views/Dashboard/components/AssignVideos.js'
import CreateUser from './views/Dashboard/components/CreateUser.js'
import CreatedUser from './views/Dashboard/components/CreatedUser.js'
import Home from './views/Dashboard/components/Home.js'
import Account from './views/Dashboard/components/Account.js'
import Home from './views/Dashboard/components/Home'
import Info from './views/Dashboard/components/Info'
import Help from './views/Dashboard/components/Help'

// Route restrictions
import ProtectedRoute from './routes-config/ProtectedRoute.js'
import Sidebar from './views/Dashboard/components/Sidebar.js'

export const UserContext = React.createContext(null)

Expand All @@ -30,24 +32,19 @@ function App() {
<Route exact path='dashboard' element={
<ProtectedRoute user={user}>
<DashBoard />
</ProtectedRoute>
}>
</ProtectedRoute>}>
<Route path='videoform' element={<VideoForm/>}/>
<Route path='videodashboard' element={<ShowVideos />}/>
<Route path='settings' element={<Settings/>}/>
<Route path='screenrecorder' element={<ScreenRecorder/>}/>
{/* <Route path='create-user' element={<CreateUser />}>
<Route path='created-user' element={<CreatedUser />}/>
</Route>
JORGE, NO SE REGRESA LA VISTA DE CREATE USER DESDE CREATED USER
*/}
<Route path='create-user' element={<CreateUser />}></Route>
<Route path='create-user' element={<CreateUser />}/>
<Route path='created-user' element={<CreatedUser />}/>
<Route path='user-management' element={<UserManagement />}/>
<Route path='assign-videos' element={<AssignVideos/>}/>
<Route path='home' element={<Home />}/>


<Route path='settings/account' element={<Account/>}/>
<Route path='settings/info' element={<Info />}/>
<Route path='settings/help' element={<Help />}/>
</Route>
</Routes>
</UserContext.Provider>
Expand Down
51 changes: 24 additions & 27 deletions amazon-solution/src/css/settings.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,48 @@
padding: 0;
box-sizing: border-box;
font-family: Inter;

}

body {
background-color: #6084a0;
color: white;
position: relative;
min-height: 100vh;
width: 100%;
overflow: hidden;
}

.dashboard {
display: flex;

}

.link {
display: flex;
text-decoration: none;
}

.menu {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
height: 100vh;
}

.sub-menu {
flex-direction: column;
justify-content: center;
/*asi se centra todo*/
/* top: 50%;
left: 50%;
transform: translate(-50%, -50%); */
height: 1000px;
width: 1500px;
margin-left: 130px;
margin-top: 60px;
animation: fadeIn 5s;
align-items: center;
animation: fadeIn 2s;
width: 50%;
}

.account,
.information,
.sound,
.help,
.s-account {
.settings-card {
background-color: #00274B;
display: flex;
align-items: center;
border-radius: 10px;
padding: 5px;
margin-right: 900px;
margin-left: 150px;
margin-bottom: 10px;
margin-top: 60px;
padding: 5%;
margin: 2%;
cursor: pointer;
width: 100%;
}

.account:hover,
Expand All @@ -74,7 +72,6 @@ body {
.h_logo {
color: white;
margin: 10px;

}


Expand All @@ -91,7 +88,7 @@ body {
margin-left: 500px;
margin-bottom: 40px;
margin-top: 60px;
animation: fadeIn 5s;
animation: fadeIn 2s;
}

.a_button {
Expand Down Expand Up @@ -130,7 +127,7 @@ body {

.help {
color: white;
animation: fadeIn 5s;
animation: fadeIn 2s;
background: none;
}

Expand Down
11 changes: 1 addition & 10 deletions amazon-solution/src/views/Dashboard/components/Account.js
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
import { RiAccountCircleLine } from 'react-icons/ri'

function Account() {
// function goBack(){
// props.setTrigger(false)
// }
return (

<div>
<div className='acc-card'>
{/* <div className='acc-pic'>
</div> */}
<div className='account-info'>
{<RiAccountCircleLine size={150} />}
<h3>Carolina Ortega</h3>
<h3>@sweetcaroline</h3>
<h3>carortega@abba.com</h3>
<h3>Rol</h3>
</div>

</div>
<button onClick={console.log("hola")} className='a_button'>Back</button>

<button onClick={console.log("hola")} className='a_button'>Back</button>
</div>

)
}

Expand Down
4 changes: 2 additions & 2 deletions amazon-solution/src/views/Dashboard/components/Help.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function Help() {

import React from "react"

function Help() {
return (
<div className="help">
<div className="help-title">
Expand Down
82 changes: 36 additions & 46 deletions amazon-solution/src/views/Dashboard/components/Settings.js
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,53 @@
//import { RiAccountCircleLine, HiOutlineInformationCircle,BsVolumeUp,BiHelpCircle,HiOutlineLockClosed} from 'react-icons/ai'
// import { Link } from '@aws-amplify/ui-react'
import { RiAccountCircleLine } from 'react-icons/ri'
import { HiOutlineInformationCircle } from 'react-icons/hi'
import { BsVolumeUp } from 'react-icons/bs'
import { BiHelpCircle } from 'react-icons/bi'
import { HiOutlineLockClosed } from 'react-icons/hi'
import Account from './Account.js'
import Info from './Info.js'
import Help from './Help.js'
import React from 'react'
import { Link, useNavigate } from 'react-router-dom'
import { Link } from 'react-router-dom'
import "../../../css/settings.css"


function Settings() {
// const [alert, setAlert] = React.useState(true)
return (
<div className='menu'>
<div>
<Link className='link' to='account-settings'>
<div className='account'>
<div className='a_logo'>
{<RiAccountCircleLine size={50} />}
<div className='sub-menu'>
<div>
<Link className='link' to='account'>
<div className='settings-card'>
<div className='a_logo'>
{<RiAccountCircleLine size={50} />}
</div>
<div className='a_title' >
<h1>Account</h1>
</div>
</div>
<div className='a_title' >
<h1>Account</h1>
</Link>
</div>
<div>
<Link className='link' to='info'>
<div className='settings-card'>
<div className='i_logo'>
{<HiOutlineInformationCircle size={50} />}
</div>
<div className='i_title'>
<h1>Information</h1>
</div>
</div>
</div>
</Link>


</div>

<Link className='link' to='info-settings'>
<div className='information'>
<div className='i_logo'>
{<HiOutlineInformationCircle size={50} />}
</div>
<div className='i_title'>
<h1>Information</h1>
</div>
</Link>
</div>
</Link>


<Link className='link' to='help-settings'>
<div className='help'>
<div className='h_logo'>
{<BiHelpCircle size={50} />}
</div>
<div className='h_title'>
<h1>Help</h1>
</div>
</div >
</Link>
<div>
<Link className='link' to='help'>
<div className='settings-card'>
<div className='h_logo'>
{<BiHelpCircle size={50} />}
</div>
<div className='h_title'>
<h1>Help</h1>
</div>
</div >
</Link>
</div>
</div>
</div>



)
}

Expand Down
1 change: 0 additions & 1 deletion amazon-solution/src/views/Dashboard/components/Sidebar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ function Sidebar() {
<Link className='link' to='home'>
<div className='logo' ><img src={require('../../../assets/Syncall_logo.png')} className='logo-icon' />
<div className='logo-name'>SynCall</div>

</div>
</Link>
<div className='menu-btn' onClick={sidebarUtil}>
Expand Down
7 changes: 0 additions & 7 deletions amazon-solution/src/views/DashboardAdmin/DashboardAdmin.js
View file

This file was deleted.

Empty file removed amazon-solution/src/views/DashboardAdmin/components/ShowVideos.js
View file
Empty file.

0 comments on commit 4223cae

Please sign in to comment.