RanchiMall/ribc
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
sairaj mote 2022-10-29 02:48:17 +05:30
parent bc3507233c
commit 56da7df2b8
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/main.css
View File

@ -985,7 +985,7 @@ ul {
border-radius: 0.5rem; border-radius: 0.5rem;
background-color: rgba(var(--foreground-color), 1); background-color: rgba(var(--foreground-color), 1);
width: 100%; width: 100%;
border: solid 0.2rem rgba(var(--text-color), 0.8); border: solid thin rgba(var(--text-color), 0.1);
} }
.display-task__category { .display-task__category {
display: inline-flex; display: inline-flex;
@ -1048,11 +1048,11 @@ ul {
display: inline-flex; display: inline-flex;
position: relative; position: relative;
align-self: flex-start; align-self: flex-start;
height: 1.4rem; height: 1.2rem;
padding: 0.15rem; padding: 0.16rem;
aspect-ratio: 1/1; aspect-ratio: 1/1;
border-radius: 50%; border-radius: 50%;
background: rgba(var(--text-color), 0.1); background: linear-gradient(rgba(var(--text-color), 0.1), rgba(var(--text-color), 0.1)), linear-gradient(rgba(var(--foreground-color), 1), rgba(var(--foreground-color), 1));
z-index: 1; z-index: 1;
} }
.task .left .circle .icon { .task .left .circle .icon {

2
css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
css/main.scss
View File

@ -981,7 +981,7 @@ ul {
border-radius: 0.5rem; border-radius: 0.5rem;
background-color: rgba(var(--foreground-color), 1); background-color: rgba(var(--foreground-color), 1);
width: 100%; width: 100%;
border: solid 0.2rem rgba(var(--text-color), 0.8); border: solid thin rgba(var(--text-color), 0.1);
&__category { &__category {
display: inline-flex; display: inline-flex;
padding: 0.3rem 0.5rem; padding: 0.3rem 0.5rem;
@ -1043,11 +1043,18 @@ ul {
display: inline-flex; display: inline-flex;
position: relative; position: relative;
align-self: flex-start; align-self: flex-start;
height: 1.4rem; height: 1.2rem;
padding: 0.15rem; padding: 0.16rem;
aspect-ratio: 1/1; aspect-ratio: 1/1;
border-radius: 50%; border-radius: 50%;
background: rgba(var(--text-color), 0.1); background: linear-gradient(
rgba(var(--text-color), 0.1),
rgba(var(--text-color), 0.1)
),
linear-gradient(
rgba(var(--foreground-color), 1),
rgba(var(--foreground-color), 1)
);
z-index: 1; z-index: 1;
.icon { .icon {
width: 100%; width: 100%;

17
index.html
View File

@ -105,7 +105,7 @@
</div> </div>
<img src="assets/working-intern.svg" alt=""> <img src="assets/working-intern.svg" alt="">
</div> </div>
<div id="landing_tasks_wrapper" class="flex flex-direction-column gap-1 justify-center"></div> <div id="landing_tasks_wrapper" class="flex flex-direction-column justify-center"></div>
</div> </div>
<article id="sign_in" class="inner-page hidden"> <article id="sign_in" class="inner-page hidden">
<section> <section>
@ -1094,6 +1094,7 @@
const appState = { const appState = {
params: {}, params: {},
} }
let dragger
const generalPages = ['sign_up', 'sign_in', 'loading', 'landing'] const generalPages = ['sign_up', 'sign_in', 'loading', 'landing']
function routeTo(targetPage, options = {}) { function routeTo(targetPage, options = {}) {
const { firstLoad } = options const { firstLoad } = options
@ -1179,7 +1180,7 @@
<ul id="assigned_task_list">${renderedAssignedTasks}</ul> <ul id="assigned_task_list">${renderedAssignedTasks}</ul>
</section> </section>
` : ''} ` : ''}
<div id="dashboard_tasks_wrapper" class=${`flex flex-direction-column gap-1 justify-center dashboard-view__item ${typeOfUser === 'intern' ? 'hidden' : ''}`}>${render.displayTasks(params?.category, params?.search)}</div> <div id="dashboard_tasks_wrapper" class=${`flex flex-direction-column justify-center dashboard-view__item ${typeOfUser === 'intern' ? 'hidden' : ''}`}>${render.displayTasks(params?.category, params?.search)}</div>
<div id="projects_wrapper" class="grid gap-2 align-items-start dashboard-view__item hidden"> <div id="projects_wrapper" class="grid gap-2 align-items-start dashboard-view__item hidden">
<section id="pinned_project_section" class="w-100"> <section id="pinned_project_section" class="w-100">
<h4>Pinned</h4> <h4>Pinned</h4>
@ -1377,7 +1378,9 @@
//show display tasks map //show display tasks map
render.taskDisplayMap() render.taskDisplayMap()
const dragger = dragula([getRef('display_task_map'), getRef('all_tasks')]) if (dragger)
dragger.destroy()
dragger = dragula([getRef('display_task_map'), getRef('all_tasks')])
dragger.on('dragend', function (el, source) { dragger.on('dragend', function (el, source) {
const newOrder = Array.from(getRef('display_task_map').children).map(el => el.dataset.taskId) const newOrder = Array.from(getRef('display_task_map').children).map(el => el.dataset.taskId)
RIBC.admin.setDisplayedTasks(newOrder) RIBC.admin.setDisplayedTasks(newOrder)
@ -2229,12 +2232,14 @@
if (displayedTasks.includes(taskId) || RIBC.getTaskStatus(projectCode, branch, task) === 'completed') continue; if (displayedTasks.includes(taskId) || RIBC.getTaskStatus(projectCode, branch, task) === 'completed') continue;
availableToDisplay.push(render.draggableTask(taskId)) availableToDisplay.push(render.draggableTask(taskId))
} }
renderElem(getRef('all_tasks'), html`${availableToDisplay}`) getRef('all_tasks').innerHTML = '';
renderElem(getRef('display_task_map'), html`${displayedTasks.map(taskId => render.draggableTask(taskId))}`) getRef('all_tasks').append(...availableToDisplay)
getRef('display_task_map').innerHTML = '';
getRef('display_task_map').append(...displayedTasks.map(taskId => render.draggableTask(taskId)))
}, },
draggableTask(taskId) { draggableTask(taskId) {
const [projectCode, branch, task] = taskId.split('_') const [projectCode, branch, task] = taskId.split('_')
return html` return html.node`
<li class="flex gap-0-5 displayable-task draggable" data-task-id=${taskId}> <li class="flex gap-0-5 displayable-task draggable" data-task-id=${taskId}>
<div class="dragging-handle"> <div class="dragging-handle">
<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 d="M11 18c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm-2-8c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0-6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm6 4c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg> <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 d="M11 18c0 1.1-.9 2-2 2s-2-.9-2-2 .9-2 2-2 2 .9 2 2zm-2-8c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0-6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm6 4c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>