@caweb/cli 1.11.1 → 1.12.0

package/commands/sites/create-site.js

@@ -9,7 +9,7 @@ import chalk from 'chalk';
 /**
  * Internal dependencies
  */
-import { appPath, writeLine } from '../../lib/index.js';
+import { appPath, writeLine, clearLine } from '../../lib/index.js';
 
 import {
 	promptForGeneralInfo,
@@ -78,6 +78,7 @@ export default async function createSite({
 		writeLine('You can also edit the configuration file later.', {color: 'cyan', prefix: 'i'});
 
 		// populate the site data
+		// prompt for each section
 		siteData = {
 			...await promptForGeneralInfo(siteTitle),
 			header: await promptForHeader(),
@@ -93,10 +94,31 @@ export default async function createSite({
 			JSON.stringify( {site:siteData}, null, 4 )
 		);
 
+		// if there is no src directory, create it
+		if( ! fs.existsSync( path.join( appPath, 'src' ) ) ) {
+			fs.mkdirSync( path.join( appPath, 'src' ) );
+
+			// create the index.js file
+			fs.writeFileSync(
+				path.join( appPath, 'src', 'index.js' ),
+				`// This is the main entry point for your CAWebPublishing site.\n// You can start coding your site here.\n\nconsole.log('Welcome to your CAWebPublishing site!');`
+			);
+		}
+
+		// create media directory if it doesn't exist
+		if( ! fs.existsSync( path.join( appPath, 'media' ) ) ) {
+			fs.mkdirSync( path.join( appPath, 'media' ) );
+		}
+
+		// clearLines for stored messages
+		// clearlines = (6 * 3) + 7
+		// (sectionCount * storedMessageLines) + Intro Lines
+		clearLine( (6 * 3) + 7 );
+
 		writeLine('CAWebPublishing Site Creation Process Complete', {char: '#', borderColor: 'green'});
 		writeLine('You can now start the site by running the following command:', {color: 'cyan', prefix: 'i'});
 		writeLine(`npm run caweb serve`, {color: 'cyan', prefix: 'i'});
 
-		spinner.start('CAWebPublishing Site Configuration file saved.');
-		
+		spinner.text = `CAWebPublishing Site Configuration file saved at ${path.join( appPath, 'caweb.json' )}.`;
+
 };

package/commands/sites/prompts.js

@@ -28,8 +28,7 @@ const headerNav = [
         "sub": [
                     {
                         "label": "Accessibility",
-                        "url": "https://caweb.cdt.ca.gov/accessibility-2/",
-                        "description": "Accessibility"
+                        "url": "https://caweb.cdt.ca.gov/accessibility-2/"
                     },
                 ]
     }
@@ -157,7 +156,7 @@ async function promptForHeader(){
     }
 
     // if navigation is selected, prompt for navigation configurations.
-     if( features.includes('navigation') ){
+    if( features.includes('navigation') ){
         
         writeLine('Navigation', {bold: true});
         writeLine('The Navigation is a set of links that are displayed to navigate your site.', {color: 'cyan', prefix: 'i'});
@@ -184,8 +183,6 @@ async function promptForHeader(){
         clearLine((header.nav.length * 3) + 2);
     }
 
-    // clear lines
-    clearLine(6);
     writeLine('Header Configurations Stored.', {color: 'yellow', char: '#', borderColor: 'yellow'});
 
     // return the header object
@@ -230,7 +227,7 @@ async function promptForFooter(){
 
     // clear lines for each link plus the link stored message
     // + 5 for the header and info message
-    clearLine((footer.nav.length * 3) + 5);
+    clearLine((footer.nav.length * 3) + 2);
 
     writeLine('Footer Configurations Stored.', {color: 'yellow', char: '#', borderColor: 'yellow'});
     
@@ -518,15 +515,37 @@ async function promptForGeneralInfo(title){
    writeLine('General Site Information', {color: 'magenta', char: '#', borderColor: 'magenta'});
 
    let info = {
-    title: await input({
-            message: 'What is the title of the site?',
-            default: title,
-            required: true,
-        },
-        {
-            clearPromptOnDone: true,
-        }
-    ).catch(() => {process.exit(1);})
+        title: await input({
+                message: 'What is the title of the site?',
+                default: title,
+                required: true,
+            },
+            {
+                clearPromptOnDone: true,
+            }
+        ).catch(() => {
+            // clear lines.
+            clearLine(10);
+            process.exit(1);
+        }),
+        domain: await input({
+                message: 'What is the domain of the site?',
+                default: 'http://localhost',
+                validate: (input) => {
+                    if( ! input.startsWith('http') && ! input.startsWith('https') ){
+                        return 'Domain must start with http or https.';
+                    }
+                    return true;
+                }
+            },
+            {
+                clearPromptOnDone: true,
+            }
+        ).catch(() => {
+            // clear lines.
+            clearLine(10);
+            process.exit(1);
+        }),
    };
 
     // clear lines.

package/commands/sites/validation.js

@@ -0,0 +1,68 @@
+import { parse } from 'node-html-parser';
+import { writeLine } from '../../lib/index.js';
+
+/**
+ * Validates the HTML of a page.
+ * @param {JSDOM} document - Window document from JSDOM.
+ * @returns {boolean} - Returns true if the HTML is valid, false otherwise.
+ */
+function validatePage( document ){
+	let mainContent = document.querySelector( '#page-container #main-content' );
+
+    // Check if document doesn't have a #page-container #main-content
+    if( ! mainContent ){
+        throw new Error("The page does not have a #page-container #main-content.");
+    }
+
+    let mainContentJson =  parse( mainContent.innerHTML );
+    let mainJson = ''
+    let asideJson = '';
+
+    /**
+     * Main content is allowed 2 elements
+     * - main - renders the main content
+     * - aside - renders the sidebar content
+     */
+    for( const element of mainContentJson.children ){
+        if( element.tagName !== 'MAIN' && element.tagName !== 'ASIDE' ){
+            throw new Error("The main content must only contain <main> and <aside> elements.");
+        }else if( element.tagName === 'MAIN' ){
+            mainJson = element
+        }else if( element.tagName === 'ASIDE' ){
+            asideJson = element
+        }
+    }
+
+    /**
+     * Main should only consist of <div> elements.
+     * - .container-fluid - Used for full width containers.
+     * - .container - used for standard containers.
+     * -- Should only consist of div.row  
+     * ---- Should only consist of div.col-#  
+     * ------ All content should be in a column
+     */
+    for( const element of mainJson.children ){
+        if( element.tagName !== 'DIV' ){
+            throw new Error("The <main> element must only contain <div> elements.");
+        }else if( ! element.classList.contains( 'container-fluid' ) && ! element.classList.contains( 'container' ) ){
+            throw new Error("The <main> element must only contain <div> elements with class 'container-fluid' or 'container'.");
+        }else if( element.classList.contains( 'container' ) ){
+            for( const row of element.children ){
+                if( row.tagName !== 'DIV' || ! row.classList.contains( 'row' ) ){
+                    throw new Error("The <div> element with class 'container' must only contain <div> elements with class 'row'.");
+                }else{
+                    for( const col of row.children ){
+                        if( col.tagName !== 'DIV' || ! col.classList.toString().match( /col[-\d]*/g ) ){
+                            throw new Error("The <div> element with class 'row' must only contain <div> elements with class 'col-#'.");
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    
+}
+
+export default validatePage;