Added breadcrumbs to project explorer
This commit is contained in:
sairaj mote
parent
eaf3798f20
commit
b47702fd0f
File diff suppressed because one or more lines are too long
61
css/main.css
61
css/main.css
@ -291,7 +291,9 @@ sm-chips {
|
||||
sm-chip {
|
||||
position: relative;
|
||||
font-size: 0.9rem;
|
||||
--border-radius: 0.3rem;
|
||||
--border-radius: 0.5rem;
|
||||
--padding: 0.5rem 0.8rem;
|
||||
--background: rgba(var(--text-color), 0.06);
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
user-select: none;
|
||||
@ -545,14 +547,6 @@ ul {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.no-transformations {
|
||||
transform: none !important;
|
||||
}
|
||||
|
||||
.full-bleed {
|
||||
grid-column: 1/4;
|
||||
}
|
||||
|
||||
.h1 {
|
||||
font-size: 2.5rem;
|
||||
}
|
||||
@ -696,9 +690,8 @@ ul {
|
||||
display: grid;
|
||||
gap: 0.5rem;
|
||||
width: 100%;
|
||||
padding: 0 1.5rem 0 0.5rem;
|
||||
padding: 0 1.5rem;
|
||||
align-items: center;
|
||||
grid-template-columns: auto 1fr;
|
||||
}
|
||||
.popup__header > * {
|
||||
grid-row: 1;
|
||||
@ -711,6 +704,8 @@ ul {
|
||||
}
|
||||
.popup__header__close {
|
||||
grid-column: 1;
|
||||
margin-left: -1rem;
|
||||
justify-self: flex-start;
|
||||
}
|
||||
|
||||
.page {
|
||||
@ -1115,13 +1110,6 @@ ul {
|
||||
align-content: flex-start;
|
||||
}
|
||||
|
||||
#dashboard_view_selector {
|
||||
border-radius: 0.5rem;
|
||||
margin: 0 auto;
|
||||
padding: 0.3rem;
|
||||
background-color: rgba(var(--text-color), 0.04);
|
||||
}
|
||||
|
||||
.logo {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1643,13 +1631,29 @@ ul {
|
||||
|
||||
#project_explorer {
|
||||
padding: 0;
|
||||
grid-template-rows: -webkit-min-content 1fr;
|
||||
grid-template-rows: min-content 1fr;
|
||||
}
|
||||
#project_explorer__breadcrumbs {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.breadcrumb {
|
||||
font-weight: 500;
|
||||
}
|
||||
.breadcrumb .icon {
|
||||
margin: 0 0.5rem;
|
||||
}
|
||||
.breadcrumb--active {
|
||||
pointer-events: none;
|
||||
color: rgba(var(--text-color), 0.9);
|
||||
}
|
||||
|
||||
#project_explorer__right {
|
||||
gap: 1rem;
|
||||
align-items: flex-start;
|
||||
align-content: flex-start;
|
||||
padding: 1rem;
|
||||
padding: 0 1rem;
|
||||
}
|
||||
|
||||
#pin_project_button {
|
||||
@ -1952,9 +1956,8 @@ input[type=date]:focus {
|
||||
#task_search_input {
|
||||
width: 100%;
|
||||
}
|
||||
.hide-on-mobile,
|
||||
.hide-page-on-mobile {
|
||||
display: none;
|
||||
.hide-on-mobile {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
@media only screen and (min-width: 640px) {
|
||||
@ -1965,7 +1968,7 @@ input[type=date]:focus {
|
||||
--width: 26rem;
|
||||
}
|
||||
.popup__header {
|
||||
padding: 1.5rem 1.5rem 0 0.75rem;
|
||||
padding: 1rem 1.5rem 0 1.5rem;
|
||||
}
|
||||
#secondary_pages header {
|
||||
padding: 1.5rem 8vw;
|
||||
@ -2034,6 +2037,9 @@ input[type=date]:focus {
|
||||
width: min(48rem, 100%);
|
||||
margin: 0 auto;
|
||||
}
|
||||
#dashboard_view_selector {
|
||||
margin: 0 auto;
|
||||
}
|
||||
#intern_leaderboard_container {
|
||||
position: -webkit-sticky;
|
||||
position: sticky;
|
||||
@ -2056,24 +2062,15 @@ input[type=date]:focus {
|
||||
height: 100%;
|
||||
gap: 0;
|
||||
grid-template-columns: 16rem 3fr;
|
||||
grid-template-areas: "left right";
|
||||
background-color: rgba(var(--foreground-color), 0.3);
|
||||
overflow-y: auto;
|
||||
}
|
||||
#project_explorer__left {
|
||||
grid-area: left;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 1.5rem;
|
||||
}
|
||||
#project_explorer__left h4 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
color: var(--accent-color);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
#project_explorer__right {
|
||||
grid-area: right;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding: 1.5rem 4vw;
|
||||
|
||||
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@ -274,7 +274,9 @@ sm-chips {
|
||||
sm-chip {
|
||||
position: relative;
|
||||
font-size: 0.9rem;
|
||||
--border-radius: 0.3rem;
|
||||
--border-radius: 0.5rem;
|
||||
--padding: 0.5rem 0.8rem;
|
||||
--background: rgba(var(--text-color), 0.06);
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
@ -511,14 +513,6 @@ ul {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.no-transformations {
|
||||
transform: none !important;
|
||||
}
|
||||
|
||||
.full-bleed {
|
||||
grid-column: 1/4;
|
||||
}
|
||||
|
||||
.h1 {
|
||||
font-size: 2.5rem;
|
||||
}
|
||||
@ -665,9 +659,8 @@ ul {
|
||||
display: grid;
|
||||
gap: 0.5rem;
|
||||
width: 100%;
|
||||
padding: 0 1.5rem 0 0.5rem;
|
||||
padding: 0 1.5rem;
|
||||
align-items: center;
|
||||
grid-template-columns: auto 1fr;
|
||||
& > * {
|
||||
grid-row: 1;
|
||||
}
|
||||
@ -679,6 +672,8 @@ ul {
|
||||
}
|
||||
&__close {
|
||||
grid-column: 1;
|
||||
margin-left: -1rem;
|
||||
justify-self: flex-start;
|
||||
}
|
||||
}
|
||||
.page {
|
||||
@ -1096,12 +1091,6 @@ ul {
|
||||
overflow-y: auto;
|
||||
align-content: flex-start;
|
||||
}
|
||||
#dashboard_view_selector {
|
||||
border-radius: 0.5rem;
|
||||
margin: 0 auto;
|
||||
padding: 0.3rem;
|
||||
background-color: rgba(var(--text-color), 0.04);
|
||||
}
|
||||
.logo {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1601,12 +1590,26 @@ ul {
|
||||
}
|
||||
#project_explorer {
|
||||
padding: 0;
|
||||
grid-template-rows: min-content 1fr;
|
||||
&__breadcrumbs {
|
||||
padding: 1rem;
|
||||
}
|
||||
}
|
||||
.breadcrumb {
|
||||
font-weight: 500;
|
||||
.icon {
|
||||
margin: 0 0.5rem;
|
||||
}
|
||||
&--active {
|
||||
pointer-events: none;
|
||||
color: rgba(var(--text-color), 0.9);
|
||||
}
|
||||
}
|
||||
#project_explorer__right {
|
||||
gap: 1rem;
|
||||
align-items: flex-start;
|
||||
align-content: flex-start;
|
||||
padding: 1rem;
|
||||
padding: 0 1rem;
|
||||
}
|
||||
#pin_project_button {
|
||||
margin-left: 1rem;
|
||||
@ -1903,9 +1906,8 @@ input[type="date"] {
|
||||
#task_search_input {
|
||||
width: 100%;
|
||||
}
|
||||
.hide-on-mobile,
|
||||
.hide-page-on-mobile {
|
||||
display: none;
|
||||
.hide-on-mobile {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
@media only screen and (min-width: 640px) {
|
||||
@ -1918,7 +1920,7 @@ input[type="date"] {
|
||||
}
|
||||
|
||||
.popup__header {
|
||||
padding: 1.5rem 1.5rem 0 0.75rem;
|
||||
padding: 1rem 1.5rem 0 1.5rem;
|
||||
}
|
||||
#secondary_pages {
|
||||
header {
|
||||
@ -1995,6 +1997,9 @@ input[type="date"] {
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
#dashboard_view_selector {
|
||||
margin: 0 auto;
|
||||
}
|
||||
#intern_leaderboard_container {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
@ -2017,26 +2022,16 @@ input[type="date"] {
|
||||
height: 100%;
|
||||
gap: 0;
|
||||
grid-template-columns: 16rem 3fr;
|
||||
grid-template-areas: "left right";
|
||||
background-color: rgba(var(--foreground-color), 0.3);
|
||||
overflow-y: auto;
|
||||
}
|
||||
#project_explorer__left {
|
||||
grid-area: left;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
#project_explorer__left h4 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
color: var(--accent-color);
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
#project_explorer__right {
|
||||
grid-area: right;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding: 1.5rem 4vw;
|
||||
|
||||
105
index.html
105
index.html
@ -512,21 +512,19 @@
|
||||
<h4 class="empty-state">No intern found</h4>
|
||||
</section>
|
||||
<section id="project_explorer" class="inner-page hidden">
|
||||
<div id="project_explorer__breadcrumbs" class="flex flex-wrap align-center full-bleed"></div>
|
||||
<div id="project_explorer__left" class="list-container">
|
||||
<h4 class="padding intern-option hidden">My projects</h4>
|
||||
<div id="my_projects"></div>
|
||||
<h4 class="padding intern-option hidden">Other projects</h4>
|
||||
<div id="other_projects"></div>
|
||||
<div id="all_projects"></div>
|
||||
</div>
|
||||
<section id="project_explorer__right" class="grid hide-on-mobile">
|
||||
<section id="project_explorer__right" class="grid hidden">
|
||||
<header class="flex flex-direction-column gap-0-5 align-items-start">
|
||||
<a class="button icon-only hide-on-desktop" href="#/project_explorer" title="Go back">
|
||||
<!-- <a class="button icon-only hide-on-desktop" href="#/project_explorer" title="Go back">
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24"
|
||||
width="24px" fill="#000000">
|
||||
<path d="M0 0h24v24H0V0z" fill="none"></path>
|
||||
<path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"></path>
|
||||
</svg>
|
||||
</a>
|
||||
</a> -->
|
||||
<h2 id="project_explorer__project_title"></h2>
|
||||
</header>
|
||||
<p id="project_explorer__project_description" class="ws-pre-line wrap-around"></p>
|
||||
@ -793,12 +791,12 @@
|
||||
const domRefs = {}
|
||||
//Checks for internet connection status
|
||||
if (!navigator.onLine)
|
||||
notify('There seems to be a problem connecting to the internet, Please check you internet connection.', 'error', '', true)
|
||||
floGlobals.connectionErrorNotification = notify('There seems to be a problem connecting to the internet, Please check you internet connection.', 'error')
|
||||
window.addEventListener('offline', () => {
|
||||
notify('There seems to be a problem connecting to the internet, Please check you internet connection.', 'error', true, true)
|
||||
floGlobals.connectionErrorNotification = notify('There seems to be a problem connecting to the internet, Please check you internet connection.', 'error')
|
||||
})
|
||||
window.addEventListener('online', () => {
|
||||
getRef('notification_drawer').clearAll()
|
||||
getRef('notification_drawer').remove(floGlobals.connectionErrorNotification)
|
||||
notify('We are back online.', 'success')
|
||||
})
|
||||
// Use instead of document.getElementById
|
||||
@ -853,15 +851,14 @@
|
||||
function openPopup(popupId, pinned) {
|
||||
zIndex++
|
||||
getRef(popupId).setAttribute('style', `z-index: ${zIndex}`)
|
||||
getRef(popupId).show({ pinned })
|
||||
return getRef(popupId);
|
||||
return getRef(popupId).show({ pinned })
|
||||
}
|
||||
|
||||
// hides the popup or modal
|
||||
function closePopup() {
|
||||
function closePopup(options = {}) {
|
||||
if (popupStack.peek() === undefined)
|
||||
return;
|
||||
popupStack.peek().popup.hide()
|
||||
popupStack.peek().popup.hide(options)
|
||||
}
|
||||
|
||||
|
||||
@ -869,7 +866,6 @@
|
||||
const getConfirmation = (title, options = {}) => {
|
||||
return new Promise(resolve => {
|
||||
const { message = '', cancelText = 'Cancel', confirmText = 'OK', danger = false } = options
|
||||
openPopup('confirmation_popup', true)
|
||||
getRef('confirm_title').innerText = title;
|
||||
getRef('confirm_message').innerText = message;
|
||||
const cancelButton = getRef('confirmation_popup').querySelector('.cancel-button');
|
||||
@ -880,14 +876,21 @@
|
||||
confirmButton.classList.add('button--danger')
|
||||
else
|
||||
confirmButton.classList.remove('button--danger')
|
||||
const { opened, closed } = openPopup('confirmation_popup')
|
||||
confirmButton.onclick = () => {
|
||||
closePopup()
|
||||
resolve(true);
|
||||
closePopup({ payload: true })
|
||||
}
|
||||
cancelButton.onclick = () => {
|
||||
closePopup()
|
||||
resolve(false);
|
||||
}
|
||||
closed.then((payload) => {
|
||||
confirmButton.onclick = null
|
||||
cancelButton.onclick = null
|
||||
if (payload)
|
||||
resolve(true)
|
||||
else
|
||||
resolve(false)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@ -1192,9 +1195,11 @@
|
||||
renderAllInterns()
|
||||
break;
|
||||
case 'project_explorer':
|
||||
let breadcrumbs = []
|
||||
if (subPageId1) {
|
||||
if (params) {
|
||||
const { id: projectCode, branch } = params
|
||||
const { projectName, projectDescription } = RIBC.getProjectDetails(projectCode);
|
||||
if (appState.params.projectCode !== projectCode) {
|
||||
showProjectInfo(projectCode)
|
||||
const allProjects = getRef('project_explorer__left').querySelectorAll('.project-card');
|
||||
@ -1207,15 +1212,30 @@
|
||||
renderBranchTasks()
|
||||
}
|
||||
getRef('project_explorer__left').classList.add('hide-on-mobile')
|
||||
getRef('project_explorer__right').classList.remove('hide-on-mobile')
|
||||
getRef('project_explorer__right').classList.remove('hidden')
|
||||
breadcrumbs = [
|
||||
['Dashboard', '#/dashboard_page/projects'],
|
||||
['All projects', '#/project_explorer/projects'],
|
||||
[projectName, `#/project_explorer/project?id=${projectCode}&branch=mainLine`],
|
||||
]
|
||||
} else {
|
||||
getRef('project_explorer__left').querySelectorAll('.project-card').forEach(project => project.classList.remove('project-card--active'))
|
||||
getRef('project_explorer__left').classList.remove('hide-on-mobile')
|
||||
getRef('project_explorer__right').classList.add('hidden')
|
||||
breadcrumbs = [
|
||||
['Dashboard', '#/dashboard_page/projects'],
|
||||
['All projects', '#/project_explorer/projects']
|
||||
]
|
||||
}
|
||||
} else {
|
||||
getRef('project_explorer__left').classList.remove('hide-on-mobile')
|
||||
getRef('project_explorer__right').classList.add('hide-on-mobile')
|
||||
history.replaceState(null, '', '#/project_explorer')
|
||||
getRef('project_explorer__right').classList.add('hidden')
|
||||
history.replaceState(null, '', '#/project_explorer/projects')
|
||||
breadcrumbs = [
|
||||
['Dashboard', '#/dashboard_page/projects'],
|
||||
]
|
||||
}
|
||||
renderElem(getRef('project_explorer__breadcrumbs'), html`${createBreadcrumbs(breadcrumbs)}`)
|
||||
break;
|
||||
case 'admin_page':
|
||||
if (typeOfUser !== 'admin') return;
|
||||
@ -1341,8 +1361,12 @@
|
||||
if (document.querySelector('.nav-list__item--active'))
|
||||
document.querySelector('.nav-list__item--active').classList.remove('nav-list__item--active');
|
||||
const targetListItem = [...document.querySelectorAll(`a.nav-list__item`)].find(item => item.href.includes(pageId))
|
||||
if (targetListItem)
|
||||
if (targetListItem) {
|
||||
targetListItem.classList.add('nav-list__item--active')
|
||||
getRef('main_nav').classList.remove('hide-on-mobile')
|
||||
} else {
|
||||
getRef('main_nav').classList.add('hide-on-mobile')
|
||||
}
|
||||
document.querySelectorAll('.page').forEach(page => page.classList.add('hidden'))
|
||||
getRef(pageId).closest('.page').classList.remove('hidden')
|
||||
let ogOverflow = getRef(pageId).parentNode.style.overflow
|
||||
@ -1370,6 +1394,18 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
function createBreadcrumbs(links) {
|
||||
const crumbs = []
|
||||
links.forEach(([name, link], index) => {
|
||||
crumbs.push(html`<a href="${link}" class=${`breadcrumb ${(index === links.length - 1) ? 'breadcrumb--active' : ''}`}>${name}</a>`)
|
||||
if (index !== links.length - 1) {
|
||||
crumbs.push(html`
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
|
||||
`)
|
||||
}
|
||||
})
|
||||
return crumbs
|
||||
}
|
||||
// class based lazy loading
|
||||
class LazyLoader {
|
||||
constructor(container, elementsToRender, renderFn, options = {}) {
|
||||
@ -1848,7 +1884,11 @@
|
||||
internCard(internFloId, { selectable = false } = {}) {
|
||||
const internName = RIBC.getInternList()[internFloId]
|
||||
const internPoints = RIBC.getInternRating(internFloId)
|
||||
const initials = internName.split(' ').map(v => v.charAt(0)).join('');
|
||||
const splitName = internName.split(' ')
|
||||
let initials = splitName[0][0]
|
||||
if (splitName.length > 1) {
|
||||
initials += splitName[splitName.length - 1][0]
|
||||
}
|
||||
return html`
|
||||
<label class="intern-card align-center interact" .dataset=${{ internFloId }} onclick=${selectable ? false : showInternInfo} title="Intern Information">
|
||||
${selectable ? html`<input type="checkbox" class="intern-card__checkbox" value=${internFloId}>` : ''}
|
||||
@ -2518,9 +2558,14 @@
|
||||
completedTasksCount++
|
||||
totalPoints += completedTasks[task].points
|
||||
}
|
||||
const splitName = internName.split(' ')
|
||||
let initials = splitName[0][0]
|
||||
if (splitName.length > 1) {
|
||||
initials += splitName[splitName.length - 1][0]
|
||||
}
|
||||
renderElem(getRef('intern_info__wrapper'), html`
|
||||
<div class="flex flex-direction-column align-items-center gap-1 text-center">
|
||||
<div id="intern_info__initials" class="intern-card__initials" style=${`--color: var(${getInternColor(internFloId)})`}>${internName.split(' ').map(v => v.charAt(0)).join('')}</div>
|
||||
<div id="intern_info__initials" class="intern-card__initials" style=${`--color: var(${getInternColor(internFloId)})`}>${initials}</div>
|
||||
<h3 id="intern_info__name">${internName}</h3>
|
||||
</div>
|
||||
<sm-copy id="intern_info__flo_id" value=${internFloId}></sm-copy>
|
||||
@ -2549,7 +2594,6 @@
|
||||
</div>
|
||||
`)
|
||||
openPopup('intern_info_popup');
|
||||
// TODO: popup opening should return a promise
|
||||
let color = '--green';
|
||||
if (rating < 50) {
|
||||
color = '--danger-color'
|
||||
@ -3222,16 +3266,7 @@
|
||||
})
|
||||
}
|
||||
|
||||
if (typeOfUser === 'intern') {
|
||||
render.projectList(getRef('my_projects'), [...floGlobals.assignedProjectsList])
|
||||
sortedProjectList = sortedProjectList.filter(val => !floGlobals.assignedProjectsList.has(val));
|
||||
}
|
||||
if (sortedProjectList.length > 0) {
|
||||
getRef('other_projects').previousElementSibling.classList.remove('hidden')
|
||||
render.projectList(getRef('other_projects'), sortedProjectList)
|
||||
} else {
|
||||
getRef('other_projects').previousElementSibling.classList.add('hidden')
|
||||
}
|
||||
render.projectList(getRef('all_projects'), sortedProjectList)
|
||||
delegate(getRef('explorer_task_list'), 'click', '.apply-button', e => {
|
||||
requestForTask(e.delegateTarget)
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user