Browse Source

clean code

jam411 3 years ago
parent
commit
b759cbd63c

+ 1 - 3
packages/app/src/components/PageHistory/Revision.tsx

@@ -69,11 +69,9 @@ export const Revision = (props: RevisionProps): JSX.Element => {
     );
     );
   };
   };
 
 
-
-  if (hasDiff) {
+  if (!hasDiff) {
     return renderSimplifiedNodiff(revision);
     return renderSimplifiedNodiff(revision);
   }
   }
 
 
   return renderFull(revision);
   return renderFull(revision);
-
 };
 };

+ 2 - 0
packages/app/src/components/PageHistory/RevisionDiff.tsx

@@ -9,6 +9,8 @@ import UserDate from '../User/UserDate';
 
 
 import styles from './RevisionDiff.module.scss';
 import styles from './RevisionDiff.module.scss';
 
 
+import 'diff2html/bundles/css/diff2html.min.css';
+
 type RevisioinDiffProps = {
 type RevisioinDiffProps = {
   currentRevision: IRevisionHasPageId,
   currentRevision: IRevisionHasPageId,
   previousRevision: IRevisionHasPageId,
   previousRevision: IRevisionHasPageId,

+ 0 - 3
packages/app/src/styles/style-next.scss

@@ -5,9 +5,6 @@
 // // override codemirror
 // // override codemirror
 // @import 'override-codemirror';
 // @import 'override-codemirror';
 
 
-// import diff2html styles
-@import '~diff2html/bundles/css/diff2html.min.css';
-
 // react-bootstrap-typeahead
 // react-bootstrap-typeahead
 @import '~react-bootstrap-typeahead/css/Typeahead';
 @import '~react-bootstrap-typeahead/css/Typeahead';
 @import 'override-rbt';
 @import 'override-rbt';

+ 0 - 3
packages/core/src/interfaces/has-page-id.ts

@@ -1,3 +0,0 @@
-export type HasPageId = {
-  pageId: string,
-};

+ 4 - 1
packages/core/src/interfaces/revision.ts

@@ -1,5 +1,4 @@
 import { HasObjectId } from './has-object-id';
 import { HasObjectId } from './has-object-id';
-import { HasPageId } from './has-page-id';
 import { IUser } from './user';
 import { IUser } from './user';
 
 
 export type IRevision = {
 export type IRevision = {
@@ -12,6 +11,10 @@ export type IRevision = {
 
 
 export type IRevisionHasId = IRevision & HasObjectId;
 export type IRevisionHasId = IRevision & HasObjectId;
 
 
+type HasPageId = {
+  pageId: string,
+};
+
 export type IRevisionHasPageId = IRevisionHasId & HasPageId;
 export type IRevisionHasPageId = IRevisionHasId & HasPageId;
 
 
 export type IRevisionsForPagination = {
 export type IRevisionsForPagination = {