Merge pull request #116 from oracle/gitignore-ords-jwt-template

Fix for missing gitignore file on ords jwt template
oracle · Sep 5, 2024 · 30dfe81 · 30dfe81
2 parents 48e7b5a + 3bfa744
commit 30dfe81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/generators/index.ts b/generators/index.ts
@@ -119,9 +119,12 @@ export default class extends Generator {
                 ignoreNoMatch: true
             }
         );
+        this.fs.copy(
+            this.templatePath( `${this.options.templateChoice}/.gitignore.template` ),
+            this.destinationPath( '.gitignore' ),
+        );
         /**
          * The ORDS Concert App template provides:
-         * A .gitignore file
          * A markdown lint configuration file (.markdownlint.json)
          * A .env.example file
          * Additionally, the sample app expects that the user configures their development 
@@ -131,10 +134,6 @@ export default class extends Generator {
          * app contains their own mechanisms to talk with the db.
          */
         if( this.options.templateChoice.includes('ords-remix-jwt-sample' )){
-            this.fs.copy(
-                this.templatePath( `${this.options.templateChoice}/.gitignore` ),
-                this.destinationPath( '.gitignore' ),
-            );
             this.fs.copy(
                 this.templatePath( `${this.options.templateChoice}/.markdownlint.jsonc` ),
                 this.destinationPath( '.markdownlint.jsonc' ),
@@ -144,11 +143,6 @@ export default class extends Generator {
                 this.destinationPath( '.env.example' ),
             );
         } else {
-            this.fs.copy(
-                this.templatePath( `${this.options.templateChoice}/.gitignore.template` ),
-                this.destinationPath( '.gitignore' ),
-            );
-
             this.fs.copyTpl(
                 this.templatePath( `${ path.dirname( this.options.templateChoice ) }/app/${ path.basename( this.options.templateChoice ) == 'node-jet' ? 'index-proxied' : 'index' }.cjs` ),
                 this.destinationPath( 'server/index.cjs' ),

diff --git a/templates/ords-remix-jwt-sample/.gitignore → ...ords-remix-jwt-sample/.gitignore.template b/templates/ords-remix-jwt-sample/.gitignore → ...ords-remix-jwt-sample/.gitignore.template
diff --git a/templates/ords-remix-jwt-sample/app/README.md b/templates/ords-remix-jwt-sample/app/README.md
@@ -1,6 +1,6 @@
 # ORDS Concert App - Project  Configuration
 
-![ORDS Logo](../../images/ORDS.png)
+![ORDS Logo](../images/ORDS.png)
 
 ## Table of Contents