Skip to content

Ashish rathod #13

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.

Sign up for GitHub

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

Open
ashishrathod95 wants to merge 36 commits into
base: Linking_branch
Choose a base branch
from
Open

Ashish rathod #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
01748bf
Backend done for track-stats-step.php
adityajai25 Jan 13, 2023
cc39d06
Updated - backend of track-stats-step.php
adityajai25 Jan 13, 2023
4fdd7a0
Updated track-stats-step.php
adityajai25 Jan 13, 2023
7e67df0
sleep page completed and heart page charts remaining
Anim3shSinha Jan 14, 2023
feccce8
Merge branch 'main' of https://github.com/Shamanth-gubbi/infits into …
Shamanth-gubbi Jan 14, 2023
588eda4
Merge branch 'main' of https://github.com/Shamanth-gubbi/infits into …
Shamanth-gubbi Jan 14, 2023
f2feed6
Updated track_stats_steps.php
adityajai25 Jan 14, 2023
11dbb6d
graph updated
Anim3shSinha Jan 15, 2023
864987e
setting modified
Anim3shSinha Jan 16, 2023
2ef5962
added custom chart range picker
chetramaaseri Jan 17, 2023
b5f70ca
file name correction
chetramaaseri Jan 17, 2023
22d8442
backend track stats weight
chetramaaseri Jan 18, 2023
dec1860
Merge branch 'main' into chetram2
chetramaaseri Jan 18, 2023
5244d03
Merge pull request #52 from Shamanth-gubbi/animesh
Shamanth-gubbi Jan 19, 2023
0680ad2
Update track_stats_steps.php
Shamanth-gubbi Jan 19, 2023
fcfe24b
Merge branch 'main' into aditya
Shamanth-gubbi Jan 19, 2023
09d7002
Merge pull request #54 from Shamanth-gubbi/chetram2
Shamanth-gubbi Jan 19, 2023
228d87f
Merge pull request #53 from Shamanth-gubbi/aditya
Shamanth-gubbi Jan 19, 2023
9eecc92
final
chetramaaseri Jan 20, 2023
83ed370
Merge branch 'main' into chetram2
chetramaaseri Jan 20, 2023
09babad
Backend final
chetramaaseri Jan 20, 2023
fc6faa2
done
chetramaaseri Jan 20, 2023
9dfa8e4
removed issue in custom dates
chetramaaseri Jan 20, 2023
667b7f5
first commit
IshitaKapahiOfficial Jan 23, 2023
2d68da2
Merge branch 'main' of https://github.com/Shamanth-gubbi/infits into …
Shamanth-gubbi Jan 26, 2023
392dd4f
pulled main branch
Shamanth-gubbi Jan 26, 2023
a393ebf
Merge pull request #57 from Shamanth-gubbi/chetram2
Shamanth-gubbi Jan 26, 2023
c2a9937
done with all the stats screens except sleep
Shamanth-gubbi Jan 27, 2023
5074135
completed all the track stats pages
Shamanth-gubbi Jan 28, 2023
4aafe73
Merge pull request #58 from Shamanth-gubbi/graph2
Shamanth-gubbi Jan 28, 2023
ffca8d3
Health Form page created
Avinash0028 Feb 1, 2023
e3bd5ad
complete create health form
Avinash0028 Feb 8, 2023
993b234
Merge pull request #2 from analysed12/avinash
Avinash0028 Feb 8, 2023
cfd798b
Add files via upload
dunkumari Mar 13, 2023
3bebfc1
Fixed UI
ashishrathod95 Apr 8, 2023
830cf1e
Fixed Client_Progress UI
ashishrathod95 Apr 11, 2023
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
  •  
  •  
  •  
161 changes: 161 additions & 0 deletions IshitaKapahi18/Clients.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
.clients{
margin-left: 18rem;
font-weight: 400;
margin-top: 1.5rem;
font-family: poppins;
}
.clients_container{
display: flex;
gap: 18rem;
}

.clients_operations{
display: flex;
gap: 2rem;
}
#btn1{
background-color:white;
border: none;
color: #9C74F5;
width: auto;
}
.add_set_client{
width: auto;
margin-top: 1rem;
color: #9C74F5;
background-color:white;
box-shadow: 0.7px 0.7px 2.5px 1.5px rgb(231, 208, 253);
border-radius:0.6rem;
font-size: medium;
border: none;
display: flex;
padding-top: 0.5rem;
padding-right: 0.5rem;
}
#btn2{
width: auto;
background-color:#FD2B2B;
border: none;
color: white;
margin-top: 1rem;
border-radius: 0.6rem;
box-shadow: 0.6px 0.6px 2px 1px #ccc;
padding: 0.5rem;
padding-bottom: 0.3rem;
}
.search_client{
width: auto;
margin-top: 1rem;
color: #ACACAC;
background-color:white;
box-shadow: 0.6px 0.6px 2px 1px #ccc;
border-radius:0.6rem;
font-size: medium;
border: none;
display: flex;
padding-top: 0.5rem;
padding-right: 0.5rem;
}
#btn3{
width: auto;
background-color:white;
border: none;
color: #ACACAC;
}
.seach_clients_text{
border: none;
}
.clients_container2{
margin-top: 2rem;
}
.clients_container3{
display: none;
}
#active{
border: none;
background-color: white;
font-weight: 500;
font-size: 1.2rem;
border: 1px solid transparent;
width: auto;
}
#active:hover{
border-bottom:0.25rem solid #4B9AFB;
}
.client_wrapper1{
padding: 1.5rem;
display: flex;
gap: 1rem;
}
.client_wrapper2{
padding: 1.5rem;
display: flex;
gap: 1rem;
}
.client_profile{
height: 9rem;
width: auto;
background-color: #FAFAFA;
border-radius: 1rem;
padding: 1.5rem;
display: flex;
gap: 1.5rem;
}
img{
width: 4rem;
height: 5rem;
border-radius: 100%;
}

#btn4{
background-color: white;
border-color: #4B9AFB;
border-radius: 0.3rem;
font-size: 0.8rem;
margin-top: 0.8rem;
width: auto;
}
@media screen and (max-width: 720px) {
.clients{
margin-left: 2rem;
}
.clients_container{
display: flex;
flex-direction: column;
gap: 1rem;
}
.add_set_client{
font-size: 0.8rem;
}
.add_set{
margin-top: 0.3rem;
}
.client_wrapper1{
display: flex;
flex-direction: column;
gap: 1rem;
padding: 0.1rem;
}
.client_wrapper2{
display: flex;
flex-direction: column;
gap: 1rem;
padding: 0.1rem;
}
.clients_container3{
display: flex;
flex-direction: column;
gap: 1rem;
}
.clients_operations{
display: flex;
gap:0.5rem;
}
.clients_container3{
display: none;
}


}


155 changes: 155 additions & 0 deletions IshitaKapahi18/Clients.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<?php
include('event_calender.php');
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<link rel="stylesheet" href="Clients.css">
<link href='https://fonts.googleapis.com/css?family=Poppins' rel='stylesheet'>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
</head>
<body>
<div class="clients">
<p style="font-size:1.7rem; font-weight:500">Clients</p>
<div class="clients_container">
<div class="search_client">
<div><button id="btn3"><span class="material-symbols-outlined">search</span></button> </div>
<div>&nbsp&nbsp&nbsp&nbsp <input type="text" name="search_client" placeholder="Seach Clients" class="seach_clients_text">&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</div>
</div>


<div class="clients_operations">
<div class="add_set_client">
<div><button id="btn1"><span class="material-symbols-outlined">add</span></button> </div>
<div class="add_set"> <span>Add Clients</span></div>
</div>
<div class="add_set_client">
<div><button id="btn1"><span class="material-symbols-outlined">settings</span></button> </div>
<div class="add_set"> <span>Set Goals</span></div>
</div>

<div class="add_set_client">
<div><button id="btn1"><span class="material-symbols-outlined">notification_add</span></button> </div>
<div class="add_set"> <span>Set Reminders</span></div>
</div>
<div class="delete_client">
<button id="btn2"><span class="material-symbols-outlined">delete</span></button>

</div>


</div>


</div>

<div class="clients_container2">
<button id="active" onclick="openPage('client', this)">Active</button>
<button id="active">Pending</button>

</div>

<div class="clients_container3" id="client">
<div class="client_wrapper1">
<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>

<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>


<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>


</div>


<div class="client_wrapper2">
<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>



<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>



<div class="client_profile">
<div class="profile_1"><img src="images/pic3.jpeg" id="pic1"></div>
<div class="profile_2">
<span>Ronald Richards </span><br>
<span style="color:#4B9AFB">Profile</span>
<div class class="profile_3">
<button id="btn4">Muscle Plan</button>
<button id="btn4">2 Months</button>
</div>

</div>
</div>
</div>

</div>




</div>

</body>
</html>
Loading