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

✨[Feature Request]: popup feedback #1086

Merged
merged 4 commits into from
Jul 31, 2024
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/auto-label-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const issue = context.payload.issue;
const issueBody = issue.body ? issue.body.toLowerCase() : '';
const issueTitle = issue.title.toLowerCase();

// Add gssoc label to all issues
Expand All @@ -34,14 +33,14 @@ jobs:
labels: [label]
});
};
if (issueBody.includes('documentation') || issueTitle.includes('doc') || issueBody.includes('readme')) {
if (issueTitle.includes('documentation')) {
await addLabel('documentation');
}

if (issueBody.includes('feature') || issueBody.includes('enhancement') || issueTitle.includes('add') || issueTitle.includes('implement')) {
if (issueTitle.includes('feature')) {
await addLabel('enhancement');

}
if (issueBody.includes('bug') || issueBody.includes('fix') || issueTitle.includes('fix') || issueTitle.includes('resolve')) {
if (issueTitle.includes('bug')) {
await addLabel('bug');
}
29 changes: 1 addition & 28 deletions .github/workflows/auto-label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,4 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
labels: ['gssoc']
})

- name: Add additional labels based on title
uses: actions/github-script@v6
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const title = context.payload.pull_request.title.toLowerCase();
const labelsToAdd = [];

if (title.includes('documentation')) {
labelsToAdd.push('documentation');
}
if (title.includes('feature')) {
labelsToAdd.push('feature');
}
if (title.includes('bug')) {
labelsToAdd.push('bug');
}

if (labelsToAdd.length > 0) {
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
labels: labelsToAdd
});
}
})
2 changes: 1 addition & 1 deletion Css-Files/caduceus.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
position: fixed;
top: 85px;
right: 30px;
z-index: 1000;
z-index: 998;
transform-origin: top center;
animation: swing 3s ease-in-out infinite;
}
Expand Down
70 changes: 70 additions & 0 deletions Css-Files/popupfeedbacksctioncss.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
.overlay {
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgb(0, 0, 0);
backdrop-filter: blur(5px);
z-index: 1000;
}

.feedback-wrapper {
display: none;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: transparent;
padding: 100px;
border-radius: 10px;
z-index: 1000;
max-width: 500px;
width: 90%;
margin-top: 10px;
margin-bottom: 10px;
}

.close-btn {
position: absolute;
top: 10px;
right: 10px;
font-size: 24px;
cursor: pointer;
}

.feedback-form {
display: flex;
flex-direction: column;
}

.rating-container {
display: flex;
justify-content: space-between;
margin-bottom: 20px;
}

.rating-container button {
font-size: 24px;
background: none;
border: none;
cursor: pointer;
}

#feedback-form label {
margin-top: 10px;
}

#feedback-form input,
#feedback-form textarea {
margin-bottom: 10px;
padding: 5px;
}

.btn {
background-color: #007bff;
color: white;
border: none;
cursor: pointer;
}
2 changes: 1 addition & 1 deletion assets/css/visitors.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
backdrop-filter: blur(5px);
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1),
0 1px 3px rgba(0, 0, 0, 0.08);
z-index: 1000;
z-index: 998;
}

.visitor-counter div:first-child {
Expand Down
44 changes: 22 additions & 22 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<link rel="stylesheet" type="text/css" href="./style.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" />
<link rel="stylesheet" href="googletranslate.css">
<link rel="stylesheet" href="Css-Files/popupfeedbacksctioncss.css">
<script type="text/javascript">
(function () {
emailjs.init({
Expand Down Expand Up @@ -742,37 +743,36 @@ <h3 class="name">Shikha Pandey</h3>
</section>
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
<!-- testimonial section -->
<!-- Feedback System-->
<center>
<div class="feedback-wrapper">
<div class="feedback-form">
<h2>We'd Love Your Feedback!</h2>
<p>Let us know how we're doing and how we can improve. <br /> <span style="color: hwb(181 21% 19%);"><strong>RapiDoc</strong> Healthcare</p>
<p>This is a confused face emoji: &#x1f615;</p>
<!--POPUP Feedback System-->
<div id="overlay" class="overlay"></div>

<div id="feedback-wrapper" class="feedback-wrapper">
<div class="feedback-form">
<span class="close-btn" onclick="closeFeedback()">&times;</span>
<h2>We'd Love Your Feedback!</h2>
<p>Let us know how we're doing and how we can improve. <br /> <span style="color: hwb(181 21% 19%);"><strong>RapiDoc</strong> Healthcare</p>
<p>This is a confused face emoji: &#x1f615;</p>
<div>
<label for="rating" class="rate-us"> <strong>Please Rate us below</strong></label>
<div class="rating-container">
<label for="rating" class="rate-us"> <strong>Please Rate us below</strong></label>
<div class="rating-container">
<button type="button" onclick="handleRatingChange(1)">😡</button>
<button type="button" onclick="handleRatingChange(2)">☹️</button>
<button type="button" onclick="handleRatingChange(3)">😐</button>
<button type="button" onclick="handleRatingChange(4)">🙂</button>
<button type="button" onclick="handleRatingChange(5)">😄</button>
</div>
</div>
</div>
<form id="feedback-form" onsubmit="handleSubmit(event)">
<label for="name">Your Name</label>
<input type="text" id="name" placeholder="Enter your name" required>
<label for="email">Your Email</label>
<input type="email" id="email" placeholder="Enter your email" required>
<label for="feedback">Your Feedback</label>
<textarea id="feedback" rows="5" placeholder="Let us know how we can improve..." required></textarea>
<button type="submit" class="btn" style="width: 10rem;margin-left: 60px;">Submit Feedback</button>
</form>
</div>
<form id="feedback-form" onsubmit="handleSubmit(event)">
<label for="name">Your Name</label>
<input type="text" id="name" placeholder="Enter your name" required>
<label for="email">Your Email</label>
<input type="email" id="email" placeholder="Enter your email" required>
<label for="feedback">Your Feedback</label>
<textarea id="feedback" rows="5" placeholder="Let us know how we can improve..." required></textarea>
<button type="submit" class="btn" style="width: 10rem;">Submit Feedback</button>
</form>
</div>
</div>
</center>
<div id="feedback-message">Thanks for the feedback! ❤️ </div>
<div id="popup" class="popup">
<div class="popup-content">
Expand Down Expand Up @@ -930,5 +930,5 @@ <h4>RAPIDOC Newsletter</h4><br>
<script src="js/progressbar_and_header.js"></script>
<div id="progressBar"></div>
<script src="js/patientportal_loginjs.js"></script>
<!-- <script src="functions/index.js"></script> -->
<script src="js/popupfeedback.js"></script>
</body>
36 changes: 36 additions & 0 deletions js/popupfeedback.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
function toggleMenu() {
const navLinks = document.querySelector('.nav_link');
navLinks.classList.toggle('vis-h');
}

function openFeedback() {
document.getElementById('overlay').style.display = 'block';
document.getElementById('feedback-wrapper').style.display = 'block';
}

function closeFeedback() {
document.getElementById('overlay').style.display = 'none';
document.getElementById('feedback-wrapper').style.display = 'none';
}

function handleRatingChange(rating) {
console.log('Rating:', rating);
}

function handleSubmit(event) {
event.preventDefault();
const name = document.getElementById('name').value;
const email = document.getElementById('email').value;
const feedback = document.getElementById('feedback').value;
console.log('Feedback submitted:', { name, email, feedback });
closeFeedback();
}

// popup will be displayed when placed cursor pointer on rateus in navbar
document.addEventListener('DOMContentLoaded', function() {
const rateUsLink = document.querySelector('a[href="#feedback"]');
rateUsLink.addEventListener('click', function(e) {
e.preventDefault();
openFeedback();
});
});
36 changes: 5 additions & 31 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ section {
margin: 0px 20px 0px 20px;
align-items: center;
justify-content: space-between;
/* flex-wrap: wrap; */
}

.counts .count-box i {
Expand Down Expand Up @@ -768,7 +767,6 @@ section {
.counts .count-box p {
z-index: -1;
padding: 30px 0 0 0;
/* margin: 0; */
font-family: "Roboto", sans-serif;
font-size: 14px;
color: #fffcfc;
Expand All @@ -778,7 +776,6 @@ section {
z-index: -1;
font-weight: 600;
display: block;
/* margin-top: 10px; */
color: #faf8f8;
font-size: 15px;
font-family: "Poppins", sans-serif;
Expand Down Expand Up @@ -1186,22 +1183,6 @@ section {
background: #cecccc;
}

/*
.icons {
display: flex;
margin-top: 30px;
gap: 30px;
cursor: pointer;
}

.icons i {
color: #afb6c7;
}

.icons i:hover {
color: #fff;
}
*/
@media (max-width: 768px) {
.footer {
position: relative;
Expand Down Expand Up @@ -1280,17 +1261,16 @@ footer {
border-radius: 20px;
}
.patient-portal input{
padding: 10px; /* add some padding to make it look nicer */
font-size: 16px; /* set the font size */
border: 1px solid #ccc; /* add a border */
border-radius: 5px; /* add a rounded corner effect */
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); /* add a subtle shadow effect */
padding: 10px;
font-size: 16px;
border: 1px solid #ccc;
border-radius: 5px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);

}
/* Section title styling */
.section-title h1 {
color: #29888a;
/* Sets a blue color for the heading */
text-align: center;
}

Expand All @@ -1304,7 +1284,6 @@ footer {
.form-group {
margin-top: 15px;
margin-bottom: 15px;
/* Adds bottom margin for form-group */
}

.forgot-password {
Expand All @@ -1313,18 +1292,13 @@ footer {

.form-control {
width: 100%;
/* Full width */
padding: 10px;
border: 1px solid #ccc;
/* Light gray border */
border-radius: 4px;
/* Rounded corners */
/* text-align: center; */
}

.btn {
background-color: hwb(181 16% 46%);
/* Blue background for the button */
color: white;
border: none;
padding: 10px 20px;
Expand Down