Merge pull request #9 from ycechungAI/working1

Working1
ycechungAI · Sep 16, 2021 · 81d3eb9 · 81d3eb9
2 parents 43c8d6d + ed7671e
commit 81d3eb9
Show file tree

Hide file tree

Showing 10 changed files with 2,960 additions and 3 deletions.
diff --git a/bin/index.js b/bin/index.js
@@ -176,8 +176,8 @@ var { argv } = require('yargs')
 
     //Add to the array routesList to generate <a> in index.html
     routesList.push({
-      url: createdFileName.replace(path.normalize(outputPath), '').substr(1).replaceAll(' ', '_'),
-      name: path.basename(createdFileName, '.html'),
+      url: createdFileName.replaceAll(' ', '_').replace(path.normalize(outputPath), '').substr(1),
+      name: path.basename(createdFileName.replaceAll(' ', '_'), '.html'),
     });
     await createIndexHtmlFile(routesList, stylesheet, outputPath);
   } else {
@@ -218,7 +218,7 @@ var { argv } = require('yargs')
 
       //Create the html file
       let createdFileName = await createHtmlFile(
-        path.basename(noRootFilePath, '.txt'),
+        path.basename(noRootFilePath, '.txt').replaceAll(' ', '_'),
         data,
         stylesheet,
         path.join(outputPath, path.dirname(noRootFilePath)).replaceAll(' ', '_'),

diff --git a/dist/Silver_Blaze.html b/dist/Silver_Blaze.html
diff --git a/dist/The_Adventure_of_the_Six_Napoleans.html b/dist/The_Adventure_of_the_Six_Napoleans.html
diff --git a/dist/The_Adventure_of_the_Speckled_Band.html b/dist/The_Adventure_of_the_Speckled_Band.html
diff --git a/dist/The_Naval_Treaty.html b/dist/The_Naval_Treaty.html
diff --git a/dist/The_Red_Headed_League.html b/dist/The_Red_Headed_League.html
diff --git a/dist/index.html b/dist/index.html
@@ -6,6 +6,9 @@
         <title>Home</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<<<<<<< HEAD
+        <link rel="stylesheet" href="sample_css/test.css">
+=======
         <style>
     @import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@700&display=swap');
 
@@ -70,16 +73,25 @@
         color: #3B82F6;
     }
 </style>
+>>>>>>> 5092fc77a613991eb73dad800f2cb3d6697ccacc
     </head>
     <body>
         <h1>Home menu</h1>
         <h2>Summary</h2>
             <ul>
+<<<<<<< HEAD
+        <li><a href='Silver_Blaze.html'>Silver_Blaze</a></li>
+<li><a href='The_Adventure_of_the_Six_Napoleans.html'>The_Adventure_of_the_Six_Napoleans</a></li>
+<li><a href='The_Adventure_of_the_Speckled_Band.html'>The_Adventure_of_the_Speckled_Band</a></li>
+<li><a href='The_Naval_Treaty.html'>The_Naval_Treaty</a></li>
+<li><a href='The_Red_Headed_League.html'>The_Red_Headed_League</a></li>
+=======
         <li><a href='Silver_Blaze.html'>Silver Blaze</a></li>
 <li><a href='The_Adventure_of_the_Six_Napoleans.html'>The Adventure of the Six Napoleans</a></li>
 <li><a href='The_Adventure_of_the_Speckled_Band.html'>The Adventure of the Speckled Band</a></li>
 <li><a href='The_Naval_Treaty.html'>The Naval Treaty</a></li>
 <li><a href='The_Red_Headed_League.html'>The Red Headed League</a></li>
+>>>>>>> 5092fc77a613991eb73dad800f2cb3d6697ccacc
 <li><a href='test/test2/test.html'>test</a></li>
 <li><a href='test/test2.html'>test2</a></li>
 <li><a href='test/test3.html'>test3</a></li>

diff --git a/dist/test/test2.html b/dist/test/test2.html
@@ -6,6 +6,15 @@
         <title>Document</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<<<<<<< HEAD
+        <link rel="stylesheet" href="sample_css/test.css">
+    </head>
+    <body>
+        <h1>Document</h1>
+        <p>tthis is a test2</p>
+
+<p>checking somethingis it working</p>
+=======
         <style>
     @import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@700&display=swap');
 
@@ -76,6 +85,7 @@ <h1>Document</h1>
         <p>tthis_is_a_test2</p>
 
 <p>checking_somethingis_it_working</p>
+>>>>>>> 5092fc77a613991eb73dad800f2cb3d6697ccacc
 
     </body>
     </html>

diff --git a/dist/test/test2/test.html b/dist/test/test2/test.html
@@ -6,6 +6,13 @@
         <title>Document</title>
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<<<<<<< HEAD
+        <link rel="stylesheet" href="sample_css/test.css">
+    </head>
+    <body>
+        <h1>Document</h1>
+        <p>this is a sample paragraphanother sample paragraph</p>
+=======
         <style>
     @import url('https://fonts.googleapis.com/css2?family=Libre+Baskerville:wght@700&display=swap');
 
@@ -74,6 +81,7 @@
     <body>
         <h1>Document</h1>
         <p>this_is_a_sample_paragraphanother_sample_paragraph</p>
+>>>>>>> 5092fc77a613991eb73dad800f2cb3d6697ccacc
 
     </body>
     </html>