From 2aedd4a89c3ccc44490bf319425e08ef4628b811 Mon Sep 17 00:00:00 2001 From: luis_lu_dominguez Date: Thu, 5 Sep 2024 16:16:42 -0600 Subject: [PATCH 1/2] chore: rename gitignore to gitingore.template --- generators/index.ts | 14 ++++---------- .../{.gitignore => .gitignore.template} | 0 2 files changed, 4 insertions(+), 10 deletions(-) rename templates/ords-remix-jwt-sample/{.gitignore => .gitignore.template} (100%) diff --git a/generators/index.ts b/generators/index.ts index c1f6168..ab6ee1a 100644 --- 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 b/templates/ords-remix-jwt-sample/.gitignore.template similarity index 100% rename from templates/ords-remix-jwt-sample/.gitignore rename to templates/ords-remix-jwt-sample/.gitignore.template From 3bfa7444dfa5d4886b990bed1ea914b5b98539f7 Mon Sep 17 00:00:00 2001 From: luis_lu_dominguez Date: Thu, 5 Sep 2024 16:18:47 -0600 Subject: [PATCH 2/2] chore: fix logo route --- templates/ords-remix-jwt-sample/app/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ords-remix-jwt-sample/app/README.md b/templates/ords-remix-jwt-sample/app/README.md index abce064..53992f6 100644 --- 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