Skip to content

Commit

Permalink
fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jorge-cab
jorge-cab committed Jun 17, 2022
2 parents 0347fd9 + 53b63fa commit 10ee3c3
Show file tree
Hide file tree
Showing 19 changed files with 363 additions and 349 deletions.
1 change: 1 addition & 0 deletions amazon-solution/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>SynCall</title>
<link rel="icon" href="../src/assets/Syncall_logo.png" type="image/x-icon">
</head>
<body>
<div id="root"></div>
Expand Down
13 changes: 4 additions & 9 deletions amazon-solution/src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Account from './views/Dashboard/components/Account.js'

// 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 @@ -39,21 +38,17 @@ function App() {
<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='info' element={<Info />}/>
<Route path='account' element={<Account />}/>
<Route path='help' element={<Help />}/>
<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
87 changes: 60 additions & 27 deletions amazon-solution/src/css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ body {
left: 0;
padding: 6px 15px;
transition: all 0.5s ease;
border-right: black 2px solid;
}

.sidebar.active {
width: 240px;
}

.nav_list li a{
margin: 20px;
}

#ccp {
position: fixed;
right: 0;
Expand Down Expand Up @@ -123,7 +128,7 @@ body {
top: 0;
transform: translate(-50%, -50%);
border-radius: 6px;
width: 122px;
width: auto;
background-color: #fff;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.5);
line-height: 35px;
Expand All @@ -132,7 +137,8 @@ body {
opacity: 0;
pointer-events: none;
display: block;

padding-left: 5px;
padding-right: 5px;
color: black;
}

Expand Down Expand Up @@ -297,13 +303,12 @@ body {
right: 0;
height: 100%;
width: 300px;

border-top: black 2px solid;
}

.test {
background-color: #00abba;
color: white;
border-radius: 24px;
position: absolute;
top: 40%;
bottom: 50%;
Expand All @@ -314,6 +319,9 @@ body {
margin: auto;
left: 50%;
transform: translateX(-50%);
font-size: 20px;
border-radius: 20px;
cursor: pointer;
}

.login-header {
Expand Down Expand Up @@ -387,6 +395,17 @@ body {
cursor: pointer;
}

.loading-wheel {
background-color: transparent;
margin-top: 15%;
}

.loading-wheel-2 {
margin: auto;
width: 100%;
height: 100%;
}

.login-button:hover {
background-color: #3e688F;
}
Expand Down Expand Up @@ -415,12 +434,15 @@ body {
}

.create-title {
font-size: 30px;
font-size: 35px;
font-weight: 400;
letter-spacing: 2px;
margin-bottom: 5px;
margin-top: 18px;

/* margin-top: 18px; */
background-color: rgba(0, 0, 0, 0.500);
padding: 10px;
border-radius: 10px;
text-align: center;
}

.create-card {
Expand All @@ -434,7 +456,7 @@ body {
/* position the top edge of the element at the middle of the parent */
left: 50%;
/* position the left edge of the element at the middle of the parent */

border: black 2px solid;
transform: translate(-50%, -50%);

width: 75%;
Expand Down Expand Up @@ -484,15 +506,15 @@ body {
position: absolute;
display: flex;
padding: 50px;
justify-content: space-between;
justify-content: space-evenly;
height: 600px;
width: 750px;
top: 50%;
/* position the top edge of the element at the middle of the parent */
left: 50%;
/* position the left edge of the element at the middle of the parent */
border-radius: 12px;

border: black 2px solid;
transform: translate(-50%, -50%);
}

Expand All @@ -501,14 +523,14 @@ body {
position: relative;
/* margin-left: 30px ; */
/* padding-left: 10px; */
margin-left: 6%;
margin-left: 7%;
font-size: 25px;
}

.manage-search-container {

position: relative;
margin-left: 56%;
margin-left: 65%;
margin-top: -3.5%;
}

Expand All @@ -522,7 +544,7 @@ body {
left: 50%;
/* position the left edge of the element at the middle of the parent */
border-radius: 12px;

border: black 2px solid;
transform: translate(-50%, -50%);

padding: 20px;
Expand All @@ -549,6 +571,7 @@ body {
height: 30px;
width: 300px;
background-color: rgba(255, 255, 255, 0.8);
border: black 2px solid;
}

.manage-card-container {
Expand All @@ -564,7 +587,7 @@ body {
left: 50%;
/* position the left edge of the element at the middle of the parent */
border-radius: 12px;

border: black 2px solid;
transform: translate(-50%, -50%);
padding: 20px;
max-height: 68vh;
Expand Down Expand Up @@ -618,6 +641,7 @@ body {
justify-content: space-between;
margin-top: 12px;
margin-bottom: 15px;
border: black 2px solid;
}

.usercard-names-real {
Expand Down Expand Up @@ -645,6 +669,7 @@ body {
white-space: nowrap;
text-overflow: ellipsis;
max-width: 150px;
font-size: 15px;
}

.usercard-email {
Expand Down Expand Up @@ -682,16 +707,18 @@ body {
position: relative;
background: #4078a3;
padding: 20px;
/* width: 45%; */
width: 45%;
text-align: center;
font-size: 20px;
font-weight: 700;
letter-spacing: 2px;
border-radius: 12px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
justify-content: flex-start;
height: 100%;
border: black 2px solid;
}

.assign-sub-container {
Expand Down Expand Up @@ -773,8 +800,10 @@ body {
.assign-list-title {

font-weight: 700;
margin-bottom: 10px;

/* margin-bottom: 10px; */
font-size: 25px;
padding: 8px 0;
border-radius: 15px;
}

.assign-card-container {
Expand All @@ -786,30 +815,31 @@ body {
justify-content: space-between;
margin-top: 12px;
margin-bottom: 15px;

justify-content: space-between;


}

.assign-card-username {
margin-left: 0vh;
text-align: left;
}

.card-column {
display: flex;
flex-direction: column;
justify-content: left;
text-align: left;
}

.agent-info {
font-size: 10px;
border-radius: 50%;
margin-left: 5px;
}

.assign-button {
color: #00ABBA;
margin-right: 5px;
height: 30px;
width: 30px;
cursor: pointer;
border-radius: 50%;
margin-bottom: 5px;
margin: 5px;
}

.assign-button:hover {
Expand Down Expand Up @@ -913,6 +943,7 @@ body {
left: 50%;
border-radius: 12px;
transform: translate(-50%, -50%);
border: black 2px solid;
}

.vid-container {
Expand Down Expand Up @@ -940,6 +971,7 @@ body {
display: flex;
align-items: center;
justify-content: center;
border: black 2px solid;
}

.vid-sub-container-title {
Expand All @@ -958,6 +990,7 @@ body {
color: white;
padding: 2%;
border-radius: 12px;
border: black 2px solid;
}

.home-page {
Expand Down Expand Up @@ -1034,4 +1067,4 @@ body {
.create-form {
display: flex;
flex-direction: column;
}
}
Loading

0 comments on commit 10ee3c3

Please sign in to comment.