Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/theprince29/helpdesk
Browse files Browse the repository at this point in the history
  • Loading branch information
Prince_Pal committed Nov 23, 2023
2 parents 8af5ec4 + 96fd045 commit fd3b10e
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 10 deletions.
33 changes: 33 additions & 0 deletions contirbutor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ <h2 class="text-primary mt-0">Know our Contributors</h2>
</div>
</div>
</section>
<<<<<<< HEAD
<section class="page-section portfolio" style="background-color: antiquewhite;" id="portfolio">
<div class="container marketing">
<div class="row">
Expand Down Expand Up @@ -93,6 +94,38 @@ <h3 style="font-size: smaller;">[email protected]</h3>
<p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
</div>
</div>
=======
<section class="page-section portfolio" style="background-color:antiquewhite;" id="portfolio">
<div class="container marketing">
<div class="row">
<div class="col-lg-4 ">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false">
<title>Prince Pal</title>
<image href="/helpdesk/assets/img/portfolio/fullsize/princepal.jpg" width="100%" height="100%" preserveAspectRatio="xMidYMid slice"></image>
</svg>

<h2 class="fw-normal mt-4">Prince Pal</h2>
<h3 style="font-size: smaller;"> Owner & Developer</h3>
<h3 style="font-size: smaller;">CSE-AI 2k21</h3>
<h3 style="font-size: smaller;">[email protected]</h3>
<p><a class="btn btn-secondary mt-4" href="https://www.linkedin.com/in/theprince29/">Connect »</a></p>
</div><!-- /.col-lg-4 -->
<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="var(--bs-secondary-color)"></rect></svg>
<h2 class="fw-normal mt-4">Your Name</h2>
<h3 style="font-size: smaller;" class="">Content Contributor</h3>
<h3 style="font-size: smaller;">branch & year</h3>
<p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
</div><!-- /.col-lg-4 -->
<div class="col-lg-4">
<svg class="bd-placeholder-img rounded-circle" width="140" height="140" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Placeholder" preserveAspectRatio="xMidYMid slice" focusable="false"><title>Placeholder</title><rect width="100%" height="100%" fill="var(--bs-secondary-color)"></rect></svg>
<h2 class="fw-normal mt-4">Your Name</h2>
<h3 style="font-size: smaller;" class="">Backend Contributor</h3>
<h3 style="font-size: smaller;">branch & year</h3>
<p><a class="btn btn-secondary mt-4" href="#">Connect »</a></p>
</div><!-- /.col-lg-4 -->
</div><!-- /.row -->
>>>>>>> 96fd045414884bec4efece5767c852cd74687803
</div>
</div>
</section>
Expand Down
43 changes: 33 additions & 10 deletions secrets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,19 +171,27 @@ <h2 class="text-center mt-0">Computer Science and Engineering</h2>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="cse-list-semi" role="tabpanel" aria-labelledby="list-cse-semi-list">
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<a href="https://drive.google.com/file/d/1xSyh-QF54ttTJ8WtvXCUBnEOPn4TLnTt/view?usp=sharing"><button type="button" class="btn btn-primary">CHM-S101</button></a>
<a href="https://drive.google.com/file/d/1xSyh-QF54ttTJ8WtvXCUBnEOPn4TLnTt/view?usp=sharing"><button type="button" class="btn btn-primary">ESC-S101</button></a>
<button type="button" class="btn btn-primary"href="" >MTH-S101</button>
<button type="button" class="btn btn-primary" href="" >TCA-S101</button>
</div>
<<<<<<< HEAD
<div class="tab-pane fade" id="cse-list-semii" role="tabpanel" aria-labelledby="list-cse-semii-list">
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
=======
<div class="tab-pane fade" id="list-semii" role="tabpanel" aria-labelledby="list-semii-list">
<button type="button" class="btn btn-primary" href=" ">PHY-S102</button>
<button type="button" class="btn btn-primary" href="" >HSS-S101</button>
<button type="button" class="btn btn-primary" href=" ">ISC-S101</button>
<button type="button" class="btn btn-primary" href=" ">MTH-S102</button>
<button type="button" class="btn btn-primary"href=" ">TCA-S102</button>
>>>>>>> 96fd045414884bec4efece5767c852cd74687803
</div>
<div class="tab-pane fade" id="cse-list-semiii" role="tabpanel" aria-labelledby="list-cse-semiii-list">
<button type="button" class="btn btn-primary">CHE-S101</button>
Expand Down Expand Up @@ -233,12 +241,12 @@ <h2 class="text-center mt-0">Artificial Intelligence</h2>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="ai-list-semi" role="tabpanel" aria-labelledby="list-ai-semi-list">
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary" href="https://drive.google.com/file/d/1xSyh-QF54ttTJ8WtvXCUBnEOPn4TLnTt/view?usp=sharing">CHM-S101</button>
<button type="button" class="btn btn-primary" href="https://drive.google.com/file/d/11-BlP7E6aCtPjNHmkYyX45BYTSfhO11R/view?usp=sharing">ESC-S101</button>
<button type="button" class="btn btn-primary"href="" >MTH-S101</button>
<button type="button" class="btn btn-primary" href="" >TCA-S101</button>
</div>
<<<<<<< HEAD
<div class="tab-pane fade" id="ai-list-semii" role="tabpanel" aria-labelledby="list-ai-semii-list">
<button type="button" class="btn btn-primary">PHY-S101</button>
<button type="button" class="btn btn-primary">PHY-S101</button>
Expand All @@ -253,6 +261,21 @@ <h2 class="text-center mt-0">Artificial Intelligence</h2>
<button type="button" class="btn btn-primary">CSE-S101</button>
<button type="button" class="btn btn-primary">CSE-S101</button>
<button type="button" class="btn btn-primary">CSE-S101</button>
=======
<div class="tab-pane fade" id="list-semii" role="tabpanel" aria-labelledby="list-semii-list">
<button type="button" class="btn btn-primary" href=" ">PHY-S102</button>
<button type="button" class="btn btn-primary" href="" >HSS-S101</button>
<button type="button" class="btn btn-primary" href=" ">ISC-S101</button>
<button type="button" class="btn btn-primary" href=" ">MTH-S102</button>
<button type="button" class="btn btn-primary"href=" ">TCA-S102</button>
</div>
<div class="tab-pane fade" id="list-semiii" role="tabpanel" aria-labelledby="list-semiii-list">
<button type="button" class="btn btn-primary">CSE-S202</button>
<button type="button" class="btn btn-primary">CSE-S207</button>
<button type="button" class="btn btn-primary">MTH-S201</button>
<button type="button" class="btn btn-primary">MTH-S301</button>
<button type="button" class="btn btn-primary">UHV-S201</button>
>>>>>>> 96fd045414884bec4efece5767c852cd74687803
</div>
<div class="tab-pane fade" id="ai-list-semiv" role="tabpanel" aria-labelledby="list-ai-semiv-list">
<button type="button" class="btn btn-primary">CSE-S304</button>
Expand Down

0 comments on commit fd3b10e

Please sign in to comment.