BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14917 from bigbluebutton/revert-14892-lint-fixes-26-04

Browse Source 
Revert "fix(Dashboard): changes required by linter"
This commit is contained in:
Anton Georgiev 2022-04-29 16:25:58 -04:00 committed by GitHub
commit 76dbf43824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bbb-learning-dashboard/src/App.js
View File

@ -87,18 +87,14 @@ class App extends React.Component {
const cDecoded = decodeURIComponent(document.cookie);
const cArr = cDecoded.split('; ');
cArr.forEach((val) => {
if (val.indexOf(`${cookieName}=`) === 0) {
learningDashboardAccessToken = val.substring((`${cookieName}=`).length);
}
if (val.indexOf(`${cookieName}=`) === 0) learningDashboardAccessToken = val.substring((`${cookieName}=`).length);
});
// Extend AccessToken lifetime by 7d (in each access)
if (learningDashboardAccessToken !== '') {
const cookieExpiresDate = new Date();
cookieExpiresDate.setTime(cookieExpiresDate.getTime() + (3600000 * 24 * 7));
document.cookie = `ld-${meetingId}=${learningDashboardAccessToken}; \
expires=${cookieExpiresDate.toGMTString()}; \
path=/;SameSite=None;Secure`;
document.cookie = `ld-${meetingId}=${learningDashboardAccessToken}; expires=${cookieExpiresDate.toGMTString()}; path=/;SameSite=None;Secure`;
}
}

7
bbb-learning-dashboard/src/components/Card.jsx
View File

@ -34,12 +34,7 @@ function Card(props) {
}
return (
<div
className={
`flex items-start justify-between p-3 bg-white \
rounded shadow border-l-4 ${cardClass}`
}
>
<div className={`flex items-start justify-between p-3 bg-white rounded shadow border-l-4 ${cardClass}`}>
<div className="w-70">
<p className="text-lg font-semibold text-gray-700">
{ number }

24
bbb-learning-dashboard/src/components/StatusTable.jsx
View File

@ -147,21 +147,13 @@ class StatusTable extends React.Component {
aria-label={tsToHHmmss(start - periods[0].start)}
>
<a
href={
`/bigbluebutton/presentation/\
${meetingId}/${meetingId}/${slide.presentationId}\
/svg/${slide.pageNum}`
}
href={`/bigbluebutton/presentation/${meetingId}/${meetingId}/${slide.presentationId}/svg/${slide.pageNum}`}
className="block border-2 border-gray-300"
target="_blank"
rel="noreferrer"
>
<img
src={
`/bigbluebutton/presentation/\
${meetingId}/${meetingId}/${slide.presentationId}\
/thumbnail/${slide.pageNum}`
}
src={`/bigbluebutton/presentation/${meetingId}/${meetingId}/${slide.presentationId}/thumbnail/${slide.pageNum}`}
alt={intl.formatMessage({
id: 'app.learningDashboard.statusTimelineTable.thumbnail',
defaultMessage: 'Presentation thumbnail',
@ -265,10 +257,7 @@ class StatusTable extends React.Component {
const redress = '(0.375rem / 2)';
return (
<div
className={
`h-1.5 ${width} bg-gray-200 absolute \
inset-x-0 z-10 ${roundedLeft} ${roundedRight}`
}
className={`h-1.5 ${width} bg-gray-200 absolute inset-x-0 z-10 ${roundedLeft} ${roundedRight}`}
style={{
top: `calc(50% - ${redress})`,
left: `${isRTL ? offsetRight : offsetLeft}%`,
@ -296,12 +285,7 @@ class StatusTable extends React.Component {
defaultMessage: emojiConfigs[emoji.name].defaultMessage,
})}
>
<i
className={
`${emojiConfigs[emoji.name].icon} \
text-sm bbb-icon-timeline`
}
/>
<i className={`${emojiConfigs[emoji.name].icon} text-sm bbb-icon-timeline`} />
</div>
);
}) }

6
bbb-learning-dashboard/src/components/UserDetails/component.jsx
View File

@ -211,13 +211,11 @@ const UserDatailsComponent = (props) => {
<div
className="min-w-[40%] text-ellipsis text-center overflow-hidden"
title={mostCommonAnswer
? `${String.fromCharCode(mostCommonAnswer.charCodeAt(0) - 32)}\
${mostCommonAnswer.substring(1)}`
? `${String.fromCharCode(mostCommonAnswer.charCodeAt(0) - 32)}${mostCommonAnswer.substring(1)}`
: null}
>
{ mostCommonAnswer
? `${String.fromCharCode(mostCommonAnswer.charCodeAt(0) - 32)}\
${mostCommonAnswer.substring(1)}`
? `${String.fromCharCode(mostCommonAnswer.charCodeAt(0) - 32)}${mostCommonAnswer.substring(1)}`
: intl.formatMessage({
id: 'app.learningDashboard.usersTable.notAvailable',
defaultMessage: 'N/A',