From e11839586f8b6e66b3132990c57789b5bec4c278 Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 12:53:24 -0600 Subject: [PATCH 1/7] Fixed overwritting other envs files (#2) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files --- src/app/app.component.spec.ts | 29 ------------------- src/app/app.routes.ts | 3 ++ .../navbar/navbar.component.spec.ts | 23 --------------- .../text-container.component.spec.ts | 23 --------------- src/app/guards/guard.guard.ts | 11 +++++++ src/app/pages/closet/closet.component.spec.ts | 23 --------------- .../dev-settings.component.spec.ts | 23 --------------- src/app/pages/game/game.component.spec.ts | 23 --------------- src/app/pages/menu/menu.component.spec.ts | 23 --------------- .../onwork-page/onwork-page.component.spec.ts | 23 --------------- src/app/pages/p404/p404.component.spec.ts | 23 --------------- .../pages/settings/settings.component.spec.ts | 23 --------------- src/app/services/tools.service.spec.ts | 16 ---------- src/app/services/translations.service.spec.ts | 16 ---------- src/index.html | 2 +- 15 files changed, 15 insertions(+), 269 deletions(-) delete mode 100644 src/app/app.component.spec.ts delete mode 100644 src/app/components/navbar/navbar.component.spec.ts delete mode 100644 src/app/components/text-container/text-container.component.spec.ts create mode 100644 src/app/guards/guard.guard.ts delete mode 100644 src/app/pages/closet/closet.component.spec.ts delete mode 100644 src/app/pages/dev-settings/dev-settings.component.spec.ts delete mode 100644 src/app/pages/game/game.component.spec.ts delete mode 100644 src/app/pages/menu/menu.component.spec.ts delete mode 100644 src/app/pages/onwork-page/onwork-page.component.spec.ts delete mode 100644 src/app/pages/p404/p404.component.spec.ts delete mode 100644 src/app/pages/settings/settings.component.spec.ts delete mode 100644 src/app/services/tools.service.spec.ts delete mode 100644 src/app/services/translations.service.spec.ts diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts deleted file mode 100644 index 5d8f2e3..0000000 --- a/src/app/app.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { AppComponent } from './app.component'; - -describe('AppComponent', () => { - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [AppComponent], - }).compileComponents(); - }); - - it('should create the app', () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app).toBeTruthy(); - }); - - it(`should have the 'CheemsAngular' title`, () => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.componentInstance; - expect(app.title).toEqual('CheemsAngular'); - }); - - it('should render title', () => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.nativeElement as HTMLElement; - expect(compiled.querySelector('h1')?.textContent).toContain('Hello, CheemsAngular'); - }); -}); diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 8f3bfdb..fa90180 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -6,6 +6,7 @@ import { DevSettingsComponent } from './pages/dev-settings/dev-settings.componen import { ClosetComponent } from './pages/closet/closet.component'; import { OnworkPageComponent } from './pages/onwork-page/onwork-page.component'; import { P404Component } from './pages/p404/p404.component'; +import { developmentGuard, testingGuard } from './guards/guard.guard'; export const routes: Routes = [ {path: "game", component: GameComponent, pathMatch: "full"}, @@ -16,5 +17,7 @@ export const routes: Routes = [ {path: "onWork", component: OnworkPageComponent, pathMatch: "full"}, {path: "p404", component: P404Component, pathMatch: "full"}, {path: "", redirectTo: "game", pathMatch: "full"}, + {path: "development", component: GameComponent, canActivate: [developmentGuard]}, + {path: "test", component: GameComponent, canActivate: [testingGuard]}, {path: "**", redirectTo: "p404"} ]; diff --git a/src/app/components/navbar/navbar.component.spec.ts b/src/app/components/navbar/navbar.component.spec.ts deleted file mode 100644 index cfedf9e..0000000 --- a/src/app/components/navbar/navbar.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NavbarComponent } from './navbar.component'; - -describe('NavbarComponent', () => { - let component: NavbarComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [NavbarComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(NavbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/components/text-container/text-container.component.spec.ts b/src/app/components/text-container/text-container.component.spec.ts deleted file mode 100644 index 8568d8e..0000000 --- a/src/app/components/text-container/text-container.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TextContainerComponent } from './text-container.component'; - -describe('TextContainerComponent', () => { - let component: TextContainerComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [TextContainerComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(TextContainerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/guards/guard.guard.ts b/src/app/guards/guard.guard.ts new file mode 100644 index 0000000..3624bf1 --- /dev/null +++ b/src/app/guards/guard.guard.ts @@ -0,0 +1,11 @@ +import { CanActivateFn } from '@angular/router'; + +export const developmentGuard: CanActivateFn = (route, state) => { + window.location.href = "/CheemsBonkGame/development"; + return false; +}; + +export const testingGuard: CanActivateFn = (route, state) => { + window.location.href = "/CheemsBonkGame/test"; + return false; +}; diff --git a/src/app/pages/closet/closet.component.spec.ts b/src/app/pages/closet/closet.component.spec.ts deleted file mode 100644 index 571b143..0000000 --- a/src/app/pages/closet/closet.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ClosetComponent } from './closet.component'; - -describe('ClosetComponent', () => { - let component: ClosetComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ClosetComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(ClosetComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/dev-settings/dev-settings.component.spec.ts b/src/app/pages/dev-settings/dev-settings.component.spec.ts deleted file mode 100644 index 66765f4..0000000 --- a/src/app/pages/dev-settings/dev-settings.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DevSettingsComponent } from './dev-settings.component'; - -describe('DevSettingsComponent', () => { - let component: DevSettingsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [DevSettingsComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(DevSettingsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/game/game.component.spec.ts b/src/app/pages/game/game.component.spec.ts deleted file mode 100644 index 47c16c9..0000000 --- a/src/app/pages/game/game.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { GameComponent } from './game.component'; - -describe('GameComponent', () => { - let component: GameComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [GameComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(GameComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/menu/menu.component.spec.ts b/src/app/pages/menu/menu.component.spec.ts deleted file mode 100644 index 7419205..0000000 --- a/src/app/pages/menu/menu.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MenuComponent } from './menu.component'; - -describe('MenuComponent', () => { - let component: MenuComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [MenuComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(MenuComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/onwork-page/onwork-page.component.spec.ts b/src/app/pages/onwork-page/onwork-page.component.spec.ts deleted file mode 100644 index e32faf4..0000000 --- a/src/app/pages/onwork-page/onwork-page.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { OnworkPageComponent } from './onwork-page.component'; - -describe('OnworkPageComponent', () => { - let component: OnworkPageComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [OnworkPageComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(OnworkPageComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/p404/p404.component.spec.ts b/src/app/pages/p404/p404.component.spec.ts deleted file mode 100644 index 2e2f99f..0000000 --- a/src/app/pages/p404/p404.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { P404Component } from './p404.component'; - -describe('P404Component', () => { - let component: P404Component; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [P404Component] - }) - .compileComponents(); - - fixture = TestBed.createComponent(P404Component); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/settings/settings.component.spec.ts b/src/app/pages/settings/settings.component.spec.ts deleted file mode 100644 index 82c748a..0000000 --- a/src/app/pages/settings/settings.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SettingsComponent } from './settings.component'; - -describe('SettingsComponent', () => { - let component: SettingsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [SettingsComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(SettingsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/services/tools.service.spec.ts b/src/app/services/tools.service.spec.ts deleted file mode 100644 index 3225de8..0000000 --- a/src/app/services/tools.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ToolsService } from './tools.service'; - -describe('ToolsService', () => { - let service: ToolsService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ToolsService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/services/translations.service.spec.ts b/src/app/services/translations.service.spec.ts deleted file mode 100644 index 26ed361..0000000 --- a/src/app/services/translations.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TranslationsService } from './constants.service'; - -describe('TranslationsService', () => { - let service: TranslationsService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TranslationsService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/index.html b/src/index.html index e15e4fa..ac88998 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ - + From 8e4af14b0ece9a80625e3941f49cd89b9a62ec2e Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 14:54:49 -0600 Subject: [PATCH 2/7] test (#4) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b97652..5005500 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,7 +79,7 @@ jobs: run: | target_dir="deploy-folder$path" mkdir -p "$target_dir" - find "$target_dir" -mindepth 1 -not -name '.git' -not -name 'test' -not -name 'development' -exec rm -rf {} + + find "$target_dir" -mindepth 1 -maxdepth 1 -exec rm -rf {} + - name: Copy New Files to Deploy Folder env: From 9ca8e636e9494446a5577d0c2d883b2fd2f0dcd9 Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:32:58 -0600 Subject: [PATCH 3/7] Test (#6) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files * fixed deleting other envs folders * deleted loop created on dev and test routes --- .github/workflows/deploy.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5005500..71960a4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: id: set-env run: | echo "::set-output name=build_env::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'production'; else echo 'development'; fi)" - echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/test'; else echo '/development'; fi)" + echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo ''; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'development'; fi)" echo "::set-output name=page_root::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/CheemsBonkGame/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/CheemsBonkGame/test/'; else echo '/CheemsBonkGame/development/'; fi)" echo "::set-output name=build_prefix::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'prod'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'dev'; fi)" - name: Checkout code @@ -73,22 +73,37 @@ jobs: git fetch origin gh-pages git worktree add deploy-folder gh-pages + - name: backup lower environment files + if: ${{ steps.set-env.outputs.build_env == 'production' }} + env: + build_env: ${{ steps.set-env.outputs.build_env }} + run: | + mkdir -p development-backup + mkdir -p test-backup + cp -r deploy-folder/development/* development-backup/ || true + cp -r deploy-folder/test/* test-backup/ || true + - name: Clean Deployment Directory env: path: ${{ steps.set-env.outputs.path }} run: | - target_dir="deploy-folder$path" + target_dir="deploy-folder/$path" mkdir -p "$target_dir" - find "$target_dir" -mindepth 1 -maxdepth 1 -exec rm -rf {} + + find "$target_dir" -mindepth 1 -not -name '.git' -exec rm -rf {} + - name: Copy New Files to Deploy Folder env: path: ${{ steps.set-env.outputs.path }} + build_env: ${{ steps.set-env.outputs.build_env }} run: | - target_dir="deploy-folder$path" + target_dir="deploy-folder/$path" mkdir -p "$target_dir" - cp -r dist/cheems-angular/browser/* "$target_dir/" - cp README.md .gitignore "$target_dir/" + cp -r dist/cheems-angular/browser/* "$target_dir" + cp README.md .gitignore "$target_dir" + if [ "$build_env" = "production" ]; then + cp -r development-backup/* "$target_dir/development/" || true + cp -r test-backup/* "$target_dir/test/" || true + fi - name: Commit and Deploy to GitHub Pages working-directory: deploy-folder From 3afa075c7eded000a044a4b96ec8a9f216019463 Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 15:58:33 -0600 Subject: [PATCH 4/7] Test fixed? (#7) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files * fixed deleting other envs folders * deleted loop created on dev and test routes * fixed? --- .github/workflows/deploy.yml | 12 ++++-------- .pwa/index.html | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 .pwa/index.html diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 71960a4..d4bf219 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,8 +15,8 @@ jobs: id: set-env run: | echo "::set-output name=build_env::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'production'; else echo 'development'; fi)" - echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo ''; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'development'; fi)" - echo "::set-output name=page_root::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/CheemsBonkGame/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/CheemsBonkGame/test/'; else echo '/CheemsBonkGame/development/'; fi)" + echo "::set-output name=path::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'app'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'development'; fi)" + echo "::set-output name=page_root::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo '/CheemsBonkGame/app/'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo '/CheemsBonkGame/test/'; else echo '/CheemsBonkGame/development/'; fi)" echo "::set-output name=build_prefix::$(if [ '${{ github.ref }}' = 'refs/heads/release' ]; then echo 'prod'; elif [ '${{ github.ref }}' = 'refs/heads/testing' ]; then echo 'test'; else echo 'dev'; fi)" - name: Checkout code uses: actions/checkout@v3 @@ -98,12 +98,8 @@ jobs: run: | target_dir="deploy-folder/$path" mkdir -p "$target_dir" - cp -r dist/cheems-angular/browser/* "$target_dir" - cp README.md .gitignore "$target_dir" - if [ "$build_env" = "production" ]; then - cp -r development-backup/* "$target_dir/development/" || true - cp -r test-backup/* "$target_dir/test/" || true - fi + cp -r dist/cheems-angular/browser/* "$target_dir/" + cp README.md .gitignore "$target_dir/" - name: Commit and Deploy to GitHub Pages working-directory: deploy-folder diff --git a/.pwa/index.html b/.pwa/index.html new file mode 100644 index 0000000..f1f8a5f --- /dev/null +++ b/.pwa/index.html @@ -0,0 +1,15 @@ + + + + + + + Cheems Bonk Game + + + +

If you are not redirected automatically, follow this link to the app.

+ + From 752182f75ba15dbdaf71463f6145996d4224f4d2 Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 16:35:01 -0600 Subject: [PATCH 5/7] Test (#9) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files * fixed deleting other envs folders * deleted loop created on dev and test routes * fixed? * Fixed prod deployment * merge --- .github/workflows/deploy.yml | 23 ++++++-------------- .pwa/manifest-prod.webmanifest | 12 +++++------ .pwa/ngsw-config-other.json | 30 --------------------------- .pwa/ngsw-config-prod.json | 38 ---------------------------------- 4 files changed, 12 insertions(+), 91 deletions(-) delete mode 100644 .pwa/ngsw-config-other.json delete mode 100644 .pwa/ngsw-config-prod.json diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d4bf219..91c3e18 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -43,11 +43,6 @@ jobs: cp .pwa/favicon-$build_prefix.ico public/img/favicon.ico rm public/manifest.webmanifest cp .pwa/manifest-$build_prefix.webmanifest public/manifest.webmanifest - if [ "$build_prefix" = "prod" ]; then - cp .pwa/ngsw-config-prod.json ngsw-config.json - else - cp .pwa/ngsw-config-other.json ngsw-config.json - fi - name: Build the application env: @@ -73,16 +68,6 @@ jobs: git fetch origin gh-pages git worktree add deploy-folder gh-pages - - name: backup lower environment files - if: ${{ steps.set-env.outputs.build_env == 'production' }} - env: - build_env: ${{ steps.set-env.outputs.build_env }} - run: | - mkdir -p development-backup - mkdir -p test-backup - cp -r deploy-folder/development/* development-backup/ || true - cp -r deploy-folder/test/* test-backup/ || true - - name: Clean Deployment Directory env: path: ${{ steps.set-env.outputs.path }} @@ -98,8 +83,12 @@ jobs: run: | target_dir="deploy-folder/$path" mkdir -p "$target_dir" - cp -r dist/cheems-angular/browser/* "$target_dir/" - cp README.md .gitignore "$target_dir/" + cp -r dist/cheems-angular/browser/* "$target_dir" + cp README.md .gitignore "$target_dir" + if [ "$build_env" = "production" ]; then + cp .pwa/inde.html "deploy-folder/" + cp README.md .gitignore "deploy-folder/" + fi - name: Commit and Deploy to GitHub Pages working-directory: deploy-folder diff --git a/.pwa/manifest-prod.webmanifest b/.pwa/manifest-prod.webmanifest index 3fc1bab..2243dea 100644 --- a/.pwa/manifest-prod.webmanifest +++ b/.pwa/manifest-prod.webmanifest @@ -3,29 +3,29 @@ "short_name": "Cheems Bonk Game", "description": "A fun and interactive game featuring Cheems Bonk.", "display": "standalone", - "scope": "/CheemsBonkGame/", - "start_url": "/CheemsBonkGame/", + "scope": "/CheemsBonkGame/app/", + "start_url": "/CheemsBonkGame/app/", "icons": [ { - "src": "/CheemsBonkGame/img/icons/pwa/icon-72x72.png", + "src": "/CheemsBonkGame/app/img/icons/pwa/icon-72x72.png", "sizes": "72x72", "type": "image/png", "purpose": "maskable any" }, { - "src": "/CheemsBonkGame/img/icons/pwa/icon-144x144.png", + "src": "/CheemsBonkGame/app/img/icons/pwa/icon-144x144.png", "sizes": "144x144", "type": "image/png", "purpose": "maskable any" }, { - "src": "/CheemsBonkGame/img/icons/pwa/icon-192x192.png", + "src": "/CheemsBonkGame/app/img/icons/pwa/icon-192x192.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable any" }, { - "src": "/CheemsBonkGame/img/icons/pwa/icon-512x512.png", + "src": "/CheemsBonkGame/app/img/icons/pwa/icon-512x512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable any" diff --git a/.pwa/ngsw-config-other.json b/.pwa/ngsw-config-other.json deleted file mode 100644 index 1ac894a..0000000 --- a/.pwa/ngsw-config-other.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "$schema": "./node_modules/@angular/service-worker/config/schema.json", - "index": "/index.html", - "assetGroups": [ - { - "name": "app", - "installMode": "prefetch", - "resources": { - "files": [ - "/favicon.ico", - "/index.csr.html", - "/index.html", - "/manifest.webmanifest", - "/*.css", - "/*.js" - ] - } - }, - { - "name": "assets", - "installMode": "lazy", - "updateMode": "prefetch", - "resources": { - "files": [ - "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2|txt|json|xml|csv|ico)" - ] - } - } - ] -} diff --git a/.pwa/ngsw-config-prod.json b/.pwa/ngsw-config-prod.json deleted file mode 100644 index 9d35792..0000000 --- a/.pwa/ngsw-config-prod.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "./node_modules/@angular/service-worker/config/schema.json", - "index": "/index.html", - "assetGroups": [ - { - "name": "app", - "installMode": "prefetch", - "resources": { - "files": [ - "/favicon.ico", - "/index.csr.html", - "/index.html", - "/manifest.webmanifest", - "/*.css", - "/*.js" - ], - "exclude": [ - "/test/**", - "/development/**" - ] - } - }, - { - "name": "assets", - "installMode": "lazy", - "updateMode": "prefetch", - "resources": { - "files": [ - "/**/*.(svg|cur|jpg|jpeg|png|apng|webp|avif|gif|otf|ttf|woff|woff2|txt|json|xml|csv|ico)" - ], - "exclude": [ - "/test/**", - "/development/**" - ] - } - } - ] -} From cbc6f198f8ffd47c7c38b1c5c0dc0e01882b9e63 Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 17:30:33 -0600 Subject: [PATCH 6/7] test (#11) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files * fixed deleting other envs folders * deleted loop created on dev and test routes * fixed? * Fixed prod deployment * merge * don't develop from mobile --- .github/workflows/deploy.yml | 2 +- src/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 91c3e18..147affa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -86,7 +86,7 @@ jobs: cp -r dist/cheems-angular/browser/* "$target_dir" cp README.md .gitignore "$target_dir" if [ "$build_env" = "production" ]; then - cp .pwa/inde.html "deploy-folder/" + cp .pwa/index.html "deploy-folder/" cp README.md .gitignore "deploy-folder/" fi diff --git a/src/index.html b/src/index.html index ac88998..e15e4fa 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ - + From 3385b16d0e22c18569c3aa26ff8927313a9c916b Mon Sep 17 00:00:00 2001 From: Luna Luna Lopez <68486389+Luna115-onCode@users.noreply.github.com> Date: Sat, 7 Jun 2025 17:46:21 -0600 Subject: [PATCH 7/7] test (#12) * made changes * modified package dependencies * Updated Angular version and Added PWA capability * Created workflow for auto-deploy to GH pages * Fixed wrong pwa icons path * Fixed wrong favicon path * fixed deleting other envs folders * fixed deleting other envs folders * fixed deleting other envs folders * test * trying to fix development and test envs unaccesible and removed unnecesary files * trying to fix development and test envs unaccesible and removed unnecesary files * fixed deleting other envs folders * deleted loop created on dev and test routes * fixed? * Fixed prod deployment * merge * don't develop from mobile * Fixing fail status when no changes to commit --- .github/workflows/deploy.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 147affa..48607d6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -94,8 +94,12 @@ jobs: working-directory: deploy-folder run: | git add . - git commit -m "Deploy #${{ github.run_number }} from ${{ github.ref }} branch - ${{ steps.set-env.outputs.build_env }}" - GIT_SSH_COMMAND="ssh -i ~/.ssh/deploy_key -o UserKnownHostsFile=~/.ssh/known_hosts" git push git@github.com:${{ github.repository }} gh-pages --force + if git diff --cached --quiet; then + echo "No changes to commit. Skipping deployment." + else + git commit -m "Deploy #${{ github.run_number }} from ${{ github.ref }} branch - ${{ steps.set-env.outputs.build_env }}" + GIT_SSH_COMMAND="ssh -i ~/.ssh/deploy_key -o UserKnownHostsFile=~/.ssh/known_hosts" git push git@github.com:${{ github.repository }} gh-pages --force + fi - name: Clean Up Worktree run: git worktree remove deploy-folder --force