Revert "Resolve conflicts"

This reverts commit 0e46e2b74c4c3db8e521be5cf08efe100dede49a.

apps/app/src/client/components/PagePathNavSticky/PagePathNavSticky.module.scss

@@ -1,8 +1,6 @@
 @use '@growi/core-styles/scss/bootstrap/init' as bs;
 
 .grw-page-path-nav-sticky :global {
-  // width: 100%;
-
   .sticky-inner-wrapper {
     z-index: bs.$zindex-sticky;
   }

apps/app/src/client/components/PagePresentationModal.tsx

@@ -67,8 +67,7 @@ const PagePresentationModal = (): JSX.Element => {
   if (!isOpen) {
     return <></>;
   }
-  console.log(isEnabledMarp, 'Marp');
-  console.log(rendererOptions, 'renderOption');
+
   return (
     <Modal
       isOpen={isOpen}

apps/app/src/pages/[[...path]].page.tsx

@@ -237,7 +237,7 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
   useDefaultIndentSize(props.adminPreferredIndentSize);
   useIsIndentSizeForced(props.isIndentSizeForced);
   useDisableLinkSharing(props.disableLinkSharing);
-  // useRendererConfig(props.rendererConfig);
+  useRendererConfig(props.rendererConfig);
   useIsEnabledMarp(props.rendererConfig.isEnabledMarp);
   // useRendererSettings(props.rendererSettingsStr != null ? JSON.parse(props.rendererSettingsStr) : undefined);
   // useGrowiRendererConfig(props.growiRendererConfigStr != null ? JSON.parse(props.growiRendererConfigStr) : undefined);

apps/app/src/stores-universal/context.tsx

@@ -147,7 +147,6 @@ export const useIsEnabledStaleNotification = (initialData?: boolean): SWRRespons
 };
 
 export const useRendererConfig = (initialData?: RendererConfig): SWRResponse<RendererConfig, any> => {
-  console.log(initialData, 'undifined or null');
   return useContextSWR('growiRendererConfig', initialData);
 };
 

apps/app/src/stores/renderer.tsx

@@ -171,11 +171,6 @@ export const useCustomSidebarOptions = (config?: SWRConfiguration): SWRResponse<
 export const usePresentationViewOptions = (): SWRResponse<RendererOptions, Error> => {
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: rendererConfig } = useRendererConfig();
-  console.log(rendererConfig, 'rendererconfig');
-  if (!rendererConfig) {
-    console.log('RendererConfig is missing.');
-  }
-
 
   const isAllDataValid = currentPagePath != null && rendererConfig != null;