Skip to content

Commit

Permalink
fix: remove changes to package-lock, only commit lint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jsnwesson committed Oct 13, 2023
1 parent 06ed2d2 commit 83bcb30
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 22 deletions.
1 change: 1 addition & 0 deletions plugins/Plugin.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function errorFallbackDefault() {
);
}

// eslint-disable-next-line react/function-component-definition
export default function Plugin({
children, className, style, ready, errorFallbackProp,
}) {
Expand Down
1 change: 1 addition & 0 deletions plugins/PluginContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from './data/constants';
import { pluginConfigShape } from './data/shapes';

// eslint-disable-next-line react/function-component-definition
export default function PluginContainer({ config, ...props }) {
if (config === null) {
return null;
Expand Down
1 change: 1 addition & 0 deletions plugins/PluginContainerIframe.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const IFRAME_FEATURE_POLICY = (
'fullscreen; microphone *; camera *; midi *; geolocation *; encrypted-media *'
);

// eslint-disable-next-line react/function-component-definition
export default function PluginContainerIframe({
config, fallback, className, ...props
}) {
Expand Down
1 change: 1 addition & 0 deletions plugins/PluginErrorBoundary.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
// eslint-disable-next-line import/no-extraneous-dependencies
import { FormattedMessage } from 'react-intl';

import { logError } from '@edx/frontend-platform/logging';
Expand Down
29 changes: 15 additions & 14 deletions plugins/PluginSlot.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-unused-vars */
import React, { forwardRef } from 'react';

import classNames from 'classnames';
Expand Down Expand Up @@ -30,21 +31,21 @@ const PluginSlot = forwardRef(({

let finalChildren = [];
// if (plugins.length > 0) {
// if (keepDefault) {
// finalChildren.push(children);
// }
// plugins.forEach((pluginConfig) => {
// finalChildren.push(
// <PluginContainer
// key={pluginConfig.url}
// config={pluginConfig}
// fallback={finalFallback}
// {...pluginProps}
// />,
// );
// });
// if (keepDefault) {
// finalChildren.push(children);
// }
// plugins.forEach((pluginConfig) => {
// finalChildren.push(
// <PluginContainer
// key={pluginConfig.url}
// config={pluginConfig}
// fallback={finalFallback}
// {...pluginProps}
// />,
// );
// });
// } else {
finalChildren = children;
finalChildren = children;
// }

return React.createElement(
Expand Down
4 changes: 2 additions & 2 deletions src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import AppRoutes from './routes/AppRoutes';

const RealFooter = () => {
const location = useLocation();
return ['/u/edx/plugin'].includes(location.pathname) ? <></> : <Footer />;
}
return ['/u/edx/plugin'].includes(location.pathname) ? null : <Footer />;
};

subscribe(APP_READY, () => {
ReactDOM.render(
Expand Down
13 changes: 7 additions & 6 deletions src/profile/ProfilePluginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import withParams from '../utils/hoc';

ensureConfig(['CREDENTIALS_BASE_URL', 'LMS_BASE_URL'], 'ProfilePage');

// eslint-disable-next-line react/function-component-definition
function Fallback() {
return (
<div>this is broken as all get</div>
Expand Down Expand Up @@ -135,7 +136,7 @@ class ProfilePluginPage extends React.Component {
className="mb-md-3"
src={profileImage.src}
isDefault={profileImage.isDefault}
/>
/>
</div>
</div>
<div className="col pl-0">
Expand All @@ -151,33 +152,33 @@ class ProfilePluginPage extends React.Component {
visibilityName={visibilityName}
formId="name"
{...commonFormProps}
/>
/>
<Country
country={country}
visibilityCountry={visibilityCountry}
formId="country"
{...commonFormProps}
/>
/>
<Education
levelOfEducation={levelOfEducation}
visibilityLevelOfEducation={visibilityLevelOfEducation}
formId="levelOfEducation"
{...commonFormProps}
/>
/>
<SocialLinks
socialLinks={socialLinks}
visibilitySocialLinks={visibilitySocialLinks}
formId="socialLinks"
{...commonFormProps}
/>
/>
</div>
<div className="pt-md-3 col-md-8 col-lg-7 offset-lg-1">
<Bio
bio={bio}
visibilityBio={visibilityBio}
formId="bio"
{...commonFormProps}
/>
/>
</div>
</div>
</div>
Expand Down

0 comments on commit 83bcb30

Please sign in to comment.