- {/* */}
- {slide}
- )}
+
{presentationData?.presentationConfig.title}
- {Array.isArray(presentationData?.presentationFileContent) && - presentationData?.presentationFileContent.map( - (slide, index) =>
+
);
};
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index a83b345..7deb407 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -2,7 +2,8 @@ import { Outlet, useNavigate } from 'react-router-dom';
import '../assets/css/SideBar.css';
import CodePrezLogo from '../assets/logo.svg';
import { NavigationButton } from './NavigationButton';
-export const SideBar = () => {
+
+export const SideBar = () => {
const navigate = useNavigate();
const home = () => {
@@ -11,10 +12,6 @@ export const SideBar = () => {
return (
+
+ {presentationData?.presentationConfig.title}
+
-
+
);
+ } else {
+ return (
+
+ {children}
+
+ )
+ }
+
};
diff --git a/src/main/createArchive.ts b/src/main/createArchive.ts
index a0773dc..03ccc47 100644
--- a/src/main/createArchive.ts
+++ b/src/main/createArchive.ts
@@ -55,7 +55,7 @@ export const createArchive = async (data: CreationCodePrezProps, file: string) =
archive.directory(data.envDirectoryPath, 'env');
}
if (data.assetsDirectoryPath) {
- archive.directory(data.assetsDirectoryPath, 'css');
+ archive.directory(data.assetsDirectoryPath, 'assets');
}
archive.finalize().then(() => {
diff --git a/src/main/example.codeprez b/src/main/example.codeprez
deleted file mode 100644
index 9d90631..0000000
Binary files a/src/main/example.codeprez and /dev/null differ
diff --git a/src/main/markdownRenderer.ts b/src/main/markdownRenderer.ts
new file mode 100644
index 0000000..bb8088a
--- /dev/null
+++ b/src/main/markdownRenderer.ts
@@ -0,0 +1,124 @@
+import { nativeImage } from "electron";
+import hljs from "highlight.js";
+import MarkdownIt from "markdown-it";
+import path from "path";
+import fs from 'fs';
+import Token from "markdown-it/lib/token";
+import Renderer from "markdown-it/lib/renderer";
+
+type RendererRulesArguments = {
+ tokens: Token[],
+ idx: number,
+ options: MarkdownIt.Options,
+ env: any,
+ self: Renderer,
+ presentationPath: string
+}
+
+type CodeFileRendererRulesArguments = {
+ codeFilePath: string,
+ href: string | null
+}
+
+export function markdownRenderer(presentationPath: string) {
+
+ const markdownOptions: MarkdownIt.Options = {
+ highlight: function (str: string, lang: string) {
+ if (lang && hljs.getLanguage(lang)) {
+ try {
+ if(lang == "bash") {
+ return (
+ '
+
+ {Array.isArray(content) && content.map((slide, index) => (
+
+ {slide}
+
+ ))}
+
+
+ );
+};
diff --git a/src/renderer/components/SlideViewer.tsx b/src/renderer/components/SlideViewer.tsx
new file mode 100644
index 0000000..da9bb16
--- /dev/null
+++ b/src/renderer/components/SlideViewer.tsx
@@ -0,0 +1,50 @@
+import { useState, useEffect } from "react";
+import { useLocation, useNavigate } from 'react-router-dom';
+import { Slide } from '../../components/Slide';
+import "../../assets/css/SlideViewer.css"
+import { SlideShow } from './SlideShow';
+
+export const SlideViewer = () => {
+ const [presentationData, setPresentationData] = useState();
+
+ const {state} = useLocation()
+ const navigate = useNavigate()
+
+ useEffect(() => {
+ window.api.setAppToFullScreen();
+ setPresentationData(state);
+
+ document.addEventListener("keydown", escapeListener)
+ document.getElementById('viewer-container')?.focus(); //To focus on the div when the component is mounted (to be scrollable with Space or Arrow)
+ }, [state]);
+
+ const escapeListener = (e: any) => {
+ if(e.key == "Escape") {
+ closeViewer();
+
+ //Remove listener to prevent multiple listener (we don't use {once: true} because of condition Escape)
+ document.removeEventListener("keydown", escapeListener);
+ }
+ }
+
+ const closeViewer = () => {
+ window.api.setAppToMaximized();
+ navigate("/prez", {state})
+ }
+
+ return (
+
CodePrez
diff --git a/src/components/Slide.tsx b/src/components/Slide.tsx index 8b297af..6276a89 100644 --- a/src/components/Slide.tsx +++ b/src/components/Slide.tsx @@ -1,9 +1,30 @@ -export const Slide = ({ children }: any) => { +import { useEffect } from "react"; +import "../assets/css/Slide.css" + +type Props = { + children: string | React.ReactElement[]; + slideScale: "preview" | "sidebar" | "slideViewer", + className?: string +} + +export const Slide = ({ children, slideScale, className }: Props) => { + + if(typeof children == "string") { return ( - +' +
+ hljs.highlight(str, {
+ language: lang,
+ ignoreIllegals: true,
+ }).value
+ + '' +
+ hljs.highlight(str, {
+ language: lang,
+ ignoreIllegals: true,
+ }).value +
+ "' +
+ md.utils.escapeHtml(str) +
+ "" +
+ hljs.highlight(codeToDisplay, {
+ language: fileExtension[1] || "",
+ ignoreIllegals: true,
+ }).value +
+ "{config?.title}
+ +
+
+ Créé par : {config?.authors.join(", ")}
+
+
+ );
+};
diff --git a/src/renderer/utils/utils.ts b/src/renderer/utils/utils.ts
index a697926..693da49 100644
--- a/src/renderer/utils/utils.ts
+++ b/src/renderer/utils/utils.ts
@@ -1,28 +1 @@
-import hljs from "highlight.js";
-
-var md = markdownHighlight();
-
-export function markdownHighlight() {
- return require("markdown-it")({
- highlight: function (str: string, lang: string) {
- if (lang && hljs.getLanguage(lang)) {
- try {
- return (
- '' +
- hljs.highlight(str, {
- language: lang,
- ignoreIllegals: true,
- }).value +
- "' +
- md.utils.escapeHtml(str) +
- "