Skip to content

Feature/help page #49

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
dvbwitso wants to merge 13 commits into
base: zambia
Choose a base branch
from
Open

Feature/help page #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b9a1812
initial commit
dvbwitso Sep 9, 2024
7bded96
using directive and not ngroute for routing to the page
dvbwitso Sep 9, 2024
4a93bc4
added route to the help page
dvbwitso Sep 10, 2024
7adf26f
Modified the route for the help page, restored files like app.js wher…
dvbwitso Sep 10, 2024
7570d26
Refrenced some commands from The Tech Manual and changed icons on the…
dvbwitso Sep 16, 2024
057097c
Removed old files from images that are not goi-ng to be used
dvbwitso Sep 18, 2024
e7fa61b
Added HUB feedback
ntipac Sep 24, 2024
f1fd00a
Updated strings
ntipac Sep 24, 2024
b64e0eb
Merge pull request #2 from Jeenyhus/feature/string-changes
dvbwitso Sep 30, 2024
c60e2e6
Added commonly used commands and changed questions from 'How to What'…
dvbwitso Oct 9, 2024
552372c
Renamed the category from common to common_commands and rephrased Wha…
dvbwitso Oct 16, 2024
c57326a
Changed categoryFilter selection option value from commands to common…
dvbwitso Oct 16, 2024
7f1f4b9
spelling check
dvbwitso Oct 21, 2024
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
74 changes: 74 additions & 0 deletions dashboard/help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<!DOCTYPE html>
<html lang="en" ng-app="helpApp">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Help page</title>
<link rel="stylesheet" href="/css/help.css">
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/fontawesome-all.min.css">
<script src="/js/angular.min.js"></script>
<script src="/js/angular-locale_en-zm.js"></script>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/angular-filter.min.js"></script>
<script src="/js/smart-table.min.js"></script>
<script src="/js/angular-animate.js"></script>
<script src="/js/angular-sanitize.js"></script>
<script src="/js/ui-bootstrap-tpls-2.5.0.min.js"></script>
<link rel="shortcut icon" href="/images/favicon.png" type="image/x-icon">
<script src="/js/help.js"></script>
<script src="/js/bootstrap.bundle.min.js"></script>
</head>
<body ng-controller="HelpController">
<header style="background-color: rgb(7, 29, 73); padding: 20px 0;">
<div class="navbar-header logos">
<a class="navbar-brand logo" href="/coach">
<img class="img-responsive" src="images/edulution_logo_white.svg" style="height: 40px;">
</a>
</div>
<div class="text-center text-white">
<h3>Help Page</h3>
</div>
</header>

<div class="container">

<!-- Search and Filter Section -->
<div class="row g-2">
<div class="col-md-8">
<input type="search" id="searchInput" placeholder="Search..." ng-model="searchText" ng-change="filterCommands()">
</div>
<div class="col-md-4">
<select id="categoryFilter" ng-model="selectedCategory" ng-change="filterCommands()">
<option value="">All Categories</option>
<option value="software">Software</option>
<option value="kolibri">Kolibri</option>
<option value="reports">Reports</option>
<option value="hardware">Hardware</option>
<option value="common_commands">Common commands</option>
</select>
</div>
</div>

<!-- FAQ Section -->
<div id="faqContainer">
<div class="accordion" id="faqAccordion">
<div class="accordion-item" ng-repeat="faq in filteredFaqs" ng-show="faqMatches(faq)" data-category="{{faq.category}}">
<h2 class="accordion-header" id="heading{{$index}}">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{$index}}" aria-expanded="false" aria-controls="collapse{{$index}}">
<i class="fas fa-question-circle"></i> {{ faq.question }}
</button>
</h2>
<div id="collapse{{$index}}" class="accordion-collapse collapse" aria-labelledby="heading{{$index}}" data-bs-parent="#faqAccordion">
<div class="accordion-body">
<p ng-bind-html="faq.answer"></p> <!-- Render answer as HTML -->
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>
14 changes: 8 additions & 6 deletions dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<link rel="stylesheet" href="/css/fontawesome-all.min.css">
<script src="/js/angular.min.js"></script>
<script src="/js/angular-locale_en-zm.js"></script>
<script type="text/javascript" src="/js/jquery.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.min.js"></script>
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/angular-filter.min.js"></script>
<script src="/js/smart-table.min.js"></script>
<script src="/js/angular-animate.js"></script>
Expand All @@ -21,19 +21,21 @@
<script src="/js/coachDashboard/app.js"></script>
</head>

<body class="mainBackground" ng-app="edulutionPortal" ng-controller="MainCtrl">
<body class="mainBackground">
<!-- open password modal when page is loaded(prod only) -->
<span ng-init=init()></span>
<span ng-init="init()"></span>
<navigation></navigation>

<div class="container-fluid">
<ng-view></ng-view> <!-- Added ng-view directive -->
<learners ng-show="menu.isSelected(0)"></learners>
<responses ng-show="menu.isSelected(1)"></responses>
<responsesections ng-show="menu.isSelected(4)"></responsesections>
<!-- hide results by question tab for now -->
<!-- <questresponses ng-show="menu.isSelected(2)"></questresponses> -->
<testscount ng-show="menu.isSelected(3)"></testscount>
<learnerscount ng-show="menu.isSelected(5)"></learnerscount>
<learnerscount ng-show="menu.isSelected(5)"></learnerscount>
</div>
</body>

</html>
</html>
125 changes: 125 additions & 0 deletions public/css/help.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/* General Styling */
body {
font-family: 'Roboto', Arial, sans-serif;
background-color: #f8f9fa;
margin: 0;
padding: 0;
}

header {
background-color: rgb(7, 29, 73);
padding: 20px 0;
}

header .navbar-header .navbar-brand img {
height: 40px;
}

header {
color: #ffffff;
}

.container {
max-width: 1080px;
margin: 40px auto;
padding: 25px;
background-color: #ffffff;
border-radius: 10px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
}


/* Search and Filter Section */
#searchInput, #categoryFilter {
font-size: 16px;
padding: 12px;
border: 1px solid #dee2e6;
border-radius: 8px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
width: 100%;
transition: border-color 0.2s ease-in-out;
}

#searchInput:focus, #categoryFilter:focus {
border-color: #80bdff;
outline: none;
}

.row.g-2 {
display: flex;
gap: 10px;
margin-bottom: 20px;
}

.col-md-8, .col-md-4 {
flex: 1;
}

/* FAQ Section */
.accordion-item {
background-color: #fff;
border: 1px solid #ced4da;
border-radius: 4px;
margin-bottom: 20px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
}

.accordion-header {
font-size: 18px;
}

.accordion-button {
font-size: 16px;
font-weight: bold;
padding: 15px;
background-color: #f8f9fa;
border: none;
color: #495057;
display: flex;
align-items: center;
transition: background-color 0.3s ease;
}

.accordion-button:hover {
background-color: #e2e6ea;
}

.accordion-button:focus {
box-shadow: none;
}

.accordion-button.collapsed {
background-color: #f8f9fa;
}

.accordion-button i {
margin-right: 10px;
color: #0a0a0a;
}

.accordion-body {
padding: 20px;
background-color: #fff;
font-size: 15px;
line-height: 1.6;
}

.accordion-body p {
font-size: 15px;
margin: 0;
}

/* Responsive */
@media (max-width: 768px) {
.col-md-8, .col-md-4 {
flex: 100%;
}

.row.g-2 {
flex-direction: column;
}

#searchInput, #categoryFilter {
margin-bottom: 15px;
}
}
Binary file added public/images/help-web-button-2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/js/bootstrap.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions public/js/coachDashboard/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
angular.module('coachDashBoard', ['ngAnimate', 'ngSanitize', 'ui.bootstrap', 'smart-table', 'angular.filter'])
.controller('MainCtrl', function($scope, $uibModal, $log, $document, $http) {
var $ctrl = this;

/*enable angular animations*/
$ctrl.animationsEnabled = true;
$scope.init = function() {
Expand Down Expand Up @@ -280,12 +279,12 @@ angular.module('coachDashBoard', ['ngAnimate', 'ngSanitize', 'ui.bootstrap', 'sm
restrict: 'E',
templateUrl: '/js/coachDashboard/templates/navigation.html',
controller: function($window) {
this.tab = 0; /* initially set tab to 1*/
this.selectTab = function(setTab) { /* Set tab to whatever tab user clicks*/
this.tab = 0;
this.selectTab = function(setTab) {
this.tab = setTab;
/*console.log(this.tab);*/
};
this.isSelected = function(checkTab) { /* Check which tab is selected to trigger show of selected tab */
this.isSelected = function(checkTab) {
return this.tab === checkTab;

};
Expand All @@ -294,10 +293,12 @@ angular.module('coachDashBoard', ['ngAnimate', 'ngSanitize', 'ui.bootstrap', 'sm
this.refresh = function() {
$window.location.reload();
}

},
controllerAs: 'menu'
};
})

/*element directive for learners tab*/
.directive('learners', function() {
return {
Expand Down Expand Up @@ -364,4 +365,4 @@ angular.module('coachDashBoard', ['ngAnimate', 'ngSanitize', 'ui.bootstrap', 'sm
element.addClass('learnerscount');
}
};
});
});
15 changes: 11 additions & 4 deletions public/js/coachDashboard/templates/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@
</div>
<p class="title_header">Coach Dashboard</p>
<div class="index_button">
<button class="btn btn-button index_btn" ng-click="menu.refresh()">
<h4>Refresh</h4>
</button>
<!-- Refresh Button -->
<button class="btn btn-button index_btn me-2" ng-click="menu.refresh()">
<h4 class="mb-0">Refresh</h4>
</button>
<!-- Help Button -->
<a class="btn btn-light help_button" href="/help">
<img src="images/help-web-button-2.png" alt="help" class="img-fluid" style="max-width: 50px;">
</a>
</div>
</div>
</nav>

<!-- Tab Navigation -->
<div class="container-fluid tabs">
<div class="clearfix"></div>
<ul class="nav nav-tabs">
Expand Down Expand Up @@ -43,4 +50,4 @@ <h3>Learners Count</h3>
</a>
</li>
</ul>
</div>
</div>
60 changes: 60 additions & 0 deletions public/js/help.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions routes/portal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ router.get('/external_evaluations', (req, res) => {
router.get('/learner_survey', (req, res) => {
res.sendFile(path.resolve('portal/learner_survey.html'));
});

/*coach dashboard help page */
router.get('/help', (req, res) => {
res.sendFile(path.resolve('dashboard/help.html'));
});
module.exports = router