From b80b9dc0b58650a3066f1985e076d479aae655c3 Mon Sep 17 00:00:00 2001 From: Daniel Herr Date: Sun, 6 Apr 2025 19:37:08 -0500 Subject: [PATCH 1/5] Setup Firebase Hosting --- .firebaserc | 5 ++ .github/workflows/firebase-hosting-merge.yml | 19 +++++ .../firebase-hosting-pull-request.yml | 20 ++++++ .gitignore | 69 +++++++++++++++++++ firebase.json | 10 +++ 5 files changed, 123 insertions(+) create mode 100644 .firebaserc create mode 100644 .github/workflows/firebase-hosting-merge.yml create mode 100644 .github/workflows/firebase-hosting-pull-request.yml create mode 100644 .gitignore create mode 100644 firebase.json diff --git a/.firebaserc b/.firebaserc new file mode 100644 index 0000000..0fe0495 --- /dev/null +++ b/.firebaserc @@ -0,0 +1,5 @@ +{ + "projects": { + "default": "daniel-herr-software" + } +} diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml new file mode 100644 index 0000000..1a0108e --- /dev/null +++ b/.github/workflows/firebase-hosting-merge.yml @@ -0,0 +1,19 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy to Firebase Hosting on merge +on: + push: + branches: + - master +jobs: + build_and_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: ${{ secrets.GITHUB_TOKEN }} + firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_DANIEL_HERR_SOFTWARE }} + channelId: live + projectId: daniel-herr-software diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml new file mode 100644 index 0000000..717bb34 --- /dev/null +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -0,0 +1,20 @@ +# This file was auto-generated by the Firebase CLI +# https://github.com/firebase/firebase-tools + +name: Deploy to Firebase Hosting on PR +on: pull_request +permissions: + checks: write + contents: read + pull-requests: write +jobs: + build_and_preview: + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: ${{ secrets.GITHUB_TOKEN }} + firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_DANIEL_HERR_SOFTWARE }} + projectId: daniel-herr-software diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b17f631 --- /dev/null +++ b/.gitignore @@ -0,0 +1,69 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +firebase-debug.log* +firebase-debug.*.log* + +# Firebase cache +.firebase/ + +# Firebase config + +# Uncomment this if you'd like others to create their own Firebase project. +# For a team working on the same Firebase project(s), it is recommended to leave +# it commented so all members can deploy to the same project(s) in .firebaserc. +# .firebaserc + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# dataconnect generated files +.dataconnect diff --git a/firebase.json b/firebase.json new file mode 100644 index 0000000..7b7b90f --- /dev/null +++ b/firebase.json @@ -0,0 +1,10 @@ +{ + "hosting": { + "public": "main", + "ignore": [ + "firebase.json", + "**/.*", + "**/node_modules/**" + ] + } +} From ca519cfcfb304953a138066c6c3d5644954a8a21 Mon Sep 17 00:00:00 2001 From: danielstephenherr Date: Mon, 7 Apr 2025 00:48:42 +0000 Subject: [PATCH 2/5] IDX config --- .gitignore | 1 + .idx/integrations.json | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .idx/integrations.json diff --git a/.gitignore b/.gitignore index b17f631..5811461 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ node_modules/ # dataconnect generated files .dataconnect +.idx/dev.nix diff --git a/.idx/integrations.json b/.idx/integrations.json new file mode 100644 index 0000000..db374c8 --- /dev/null +++ b/.idx/integrations.json @@ -0,0 +1,5 @@ +{ + "firebase_hosting": { + "deploymentHostingUrl": "https://daniel-herr-software.web.app" + } +} \ No newline at end of file From fae561dad6d956b9418e840405e10bec0d8e28f9 Mon Sep 17 00:00:00 2001 From: Daniel Herr Date: Sun, 6 Apr 2025 19:56:18 -0500 Subject: [PATCH 3/5] Add base favicon --- main/images/avatar_32.jpg | Bin 0 -> 2242 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 main/images/avatar_32.jpg diff --git a/main/images/avatar_32.jpg b/main/images/avatar_32.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1c1eff09dc87f74aea3688e42ed4158a281b757b GIT binary patch literal 2242 zcmbtRdpwkB8-CuIaTu|gF>+{jOpJ4hQ9dz66ecW&$GT0^)IKfNEwCfWdOC}RM^BiPY2dmEycw+~Tf^mB%U3kYOIO8hqr zuDjSLsSZHTrf+EeUl`3`vI1ej8+enV;pXtLI2hxCK4U!zKJXb+Bsi8G$%Zwq5*+P8 zvxPAO#(F_t;R9dcz{qHcJ`L7T!oy-Dy(A`?Se_ZN*B$n<@WulcpaFYeBe_5P4ckwJ z0GKZTfIRmlcHj~Kcai~6eeoqmx(2}7lK}9aeu;f~lgNPRfKTO6@QFBh5P-Kg08sD- zK&cA=Ip0qle0*azB23}oxqgCI5C{WIKm=3}0Rn*$jL5(km;f{J5U_=R=RY$^k$+YJ z&K5TTj4V7D5eZ=c0s|p2koX}`hi{HR{`aO5FN>Cz0a9`>r=$3ZgHZodAW;Y@NLmIX zi&es*HI+92RWhtog8&k4@Kq565(P;Cm@L5CVzW08m(yol0&2no>A& zRN{S`q>O^YI%fq9 z4}br%zMlM=jI7yS(@cxyyV**W){hh@t8b1zpy}l>OdNXO{;N2<$U5KMq0td($UC0W zn{fO}Y3kZA8#aS}ixb%}G8#YiVq<3OmP$+ent^r_(`!6Q+dI}WB@4>-j$MOz!WcSR z^Q=|ap;*xH%J>}C<5mZLPHM(lF;Dbx(VVV;TY$V0z0>QIj;jP}tvS9PX8 zxlixG@869i9@)9xy8^$E6beWy*9Zx8wI`+;5m8*i@R6tWYQG2Oo2MOn-^rTVfs-XF zhGG0ahURKgeh~eZ#Xe}~iQ9W2%RgZ!itu(Td%C_~!!hsmx;WzkOOk=3e>#kd!#p_E2es}oO5t=o0tjcCTDJ4bPW8}vLra2g|+e>bzRG(aWYx<8}41KzO@`!ve-|#hn)?hk_LIy zxktQcR%`xf&zXu zF_e838CDV`6A-NB|L*G11rhqBaszLS$77(@*KrQXmlUbKk}ELZYi?vMYI`R$zKlOy zsm__>T$;Ef=*<{Qb7&R$1$O`F%{#1_>B0~ktEr1oc)8uK^Rlm+%;~t6*--T}<{E9~ zjtf&a_yeWVZ7I5h=PEU;G1d(CL=CFzdGl1$d{Nc-?!fn9r?z)#R@86x|Bp@Fs2B)j zY?or^R|MOV&!lcF;#?)q2M=`n3O(CulkZV?D)lwsKQ=!$%)@s2kE@YevUQP6&M9_( zIsf&I%$_vm4T&__%1FwU)n6=zkke642E8{?>L@QQ=@css_3L#4#aUlYQ<-p@RbKAn zRL6{p_)wD0uRgYiW2Aziysbs#Df}5eO*+Y(MQflQ%eTero|itiHwegWBUm-^x8C4- zn2t9dsuUJy+&@}w^z_VCXG`0Q>VFwfLy1NX{k~de4e#TZMC)7PM^*`~<(PR6MVKq}_62)5qDN#`PzThFteH8^+IE zvrsN!n}sYADwYYicf``$m(s7^q>b2HjD{L+4p(%_38@TLU+{IdRQB={-aVV_g~X7} zv1D#r-9uoe?_~We{zB$3wTZN*OkL_115wP|AA(F%mboS7nM5&o_?V!QC!<;FP&BDo zn0a{cbPW0fZ^kFIY4C{ASo;w%7^3da8}Dm)RdGky@^MqLU(`!C*=C))D_vOZa&g(Z zlh^#5bO&`p01menaEyel^r|lHf_fe#7g`GF`N;1%@$>Pk zYs)~hJ_L`# Date: Mon, 7 Apr 2025 02:23:55 +0000 Subject: [PATCH 4/5] Firebase Hosting headers config and urls fix --- firebase.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/firebase.json b/firebase.json index 7b7b90f..9430696 100644 --- a/firebase.json +++ b/firebase.json @@ -1,10 +1,19 @@ { "hosting": { "public": "main", + "cleanUrls": true, + "headers": [ { + "source": "**", + "headers": [ + { "key": "Access-Control-Allow-Origin", "value": "*" }, + { "key": "Access-Control-Expose-Headers", "value": "*" }, + { "key": "X-Content-Type-Options", "value": "nosniff" } + ] + } ], "ignore": [ "firebase.json", "**/.*", "**/node_modules/**" ] } -} +} \ No newline at end of file From c86a4e90a0f698cf72aca0edb9ec9d657b1274f6 Mon Sep 17 00:00:00 2001 From: danielstephenherr Date: Mon, 7 Apr 2025 02:39:01 +0000 Subject: [PATCH 5/5] Add favicons to all pages --- forms/404.html | 1 + forms/Uninstalled/Bookmark_Topper.html | 1 + forms/Uninstalled/Link_Controller.html | 1 + forms/Uninstalled/Memory_Monitor.html | 1 + forms/Uninstalled/Navigation_Confirmation.html | 1 + forms/Uninstalled/Processor_Monitor.html | 1 + forms/Uninstalled/Single_Tab_Zoom.html | 1 + forms/Uninstalled/Submitted.html | 3 ++- main/404.html | 1 + main/Bookmark_Topper.html | 2 +- main/Link_Controller.html | 2 +- main/Memory_Monitor.html | 2 +- main/Navigation_Confirmation.html | 2 +- main/Processor_Monitor.html | 2 +- main/Single_Tab_Zoom.html | 2 +- main/Support.html | 1 + main/index.html | 3 ++- 17 files changed, 19 insertions(+), 8 deletions(-) diff --git a/forms/404.html b/forms/404.html index 1509d03..e3c3887 100644 --- a/forms/404.html +++ b/forms/404.html @@ -4,6 +4,7 @@ No Page - Daniel Herr Software +

Daniel Herr Software

diff --git a/forms/Uninstalled/Bookmark_Topper.html b/forms/Uninstalled/Bookmark_Topper.html index 673933b..ba034c5 100644 --- a/forms/Uninstalled/Bookmark_Topper.html +++ b/forms/Uninstalled/Bookmark_Topper.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Bookmark Topper - Daniel Herr Software +
diff --git a/forms/Uninstalled/Link_Controller.html b/forms/Uninstalled/Link_Controller.html index 9797d0c..3abf3a7 100644 --- a/forms/Uninstalled/Link_Controller.html +++ b/forms/Uninstalled/Link_Controller.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Link Controller - Daniel Herr Software +
diff --git a/forms/Uninstalled/Memory_Monitor.html b/forms/Uninstalled/Memory_Monitor.html index c797145..993981e 100644 --- a/forms/Uninstalled/Memory_Monitor.html +++ b/forms/Uninstalled/Memory_Monitor.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Memory Monitor - Daniel Herr Software +
diff --git a/forms/Uninstalled/Navigation_Confirmation.html b/forms/Uninstalled/Navigation_Confirmation.html index 4360f7a..ec0c4fe 100644 --- a/forms/Uninstalled/Navigation_Confirmation.html +++ b/forms/Uninstalled/Navigation_Confirmation.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Navigation Confirmation - Daniel Herr Software +
diff --git a/forms/Uninstalled/Processor_Monitor.html b/forms/Uninstalled/Processor_Monitor.html index e5a75d3..591312f 100644 --- a/forms/Uninstalled/Processor_Monitor.html +++ b/forms/Uninstalled/Processor_Monitor.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Processor Monitor - Daniel Herr Software +
diff --git a/forms/Uninstalled/Single_Tab_Zoom.html b/forms/Uninstalled/Single_Tab_Zoom.html index 2497acf..99b6784 100644 --- a/forms/Uninstalled/Single_Tab_Zoom.html +++ b/forms/Uninstalled/Single_Tab_Zoom.html @@ -5,6 +5,7 @@ Uninstallation Feedback - Single Tab Zoom - Daniel Herr Software +
diff --git a/forms/Uninstalled/Submitted.html b/forms/Uninstalled/Submitted.html index b79eb34..ce9704a 100644 --- a/forms/Uninstalled/Submitted.html +++ b/forms/Uninstalled/Submitted.html @@ -1,9 +1,10 @@ - Feedback Submitted - Daniel Herr Software + + Feedback Submitted - Daniel Herr Software
diff --git a/main/404.html b/main/404.html index e24f348..344bbd1 100644 --- a/main/404.html +++ b/main/404.html @@ -3,6 +3,7 @@ + No Page - Daniel Herr Software diff --git a/main/Bookmark_Topper.html b/main/Bookmark_Topper.html index a0dfe14..cee85cb 100644 --- a/main/Bookmark_Topper.html +++ b/main/Bookmark_Topper.html @@ -5,7 +5,7 @@ Bookmark Topper - Daniel Herr Software - +
diff --git a/main/Link_Controller.html b/main/Link_Controller.html index 1db0bef..ecb1c14 100644 --- a/main/Link_Controller.html +++ b/main/Link_Controller.html @@ -5,7 +5,7 @@ Link Controller - Daniel Herr Software - +
diff --git a/main/Memory_Monitor.html b/main/Memory_Monitor.html index caaa010..73a120c 100644 --- a/main/Memory_Monitor.html +++ b/main/Memory_Monitor.html @@ -5,7 +5,7 @@ Memory Monitor - Daniel Herr Software - +
diff --git a/main/Navigation_Confirmation.html b/main/Navigation_Confirmation.html index 94fbae4..4ee5ebd 100644 --- a/main/Navigation_Confirmation.html +++ b/main/Navigation_Confirmation.html @@ -5,7 +5,7 @@ Navigation Confirmation - Daniel Herr Software - +
diff --git a/main/Processor_Monitor.html b/main/Processor_Monitor.html index ffa2ae9..822213c 100644 --- a/main/Processor_Monitor.html +++ b/main/Processor_Monitor.html @@ -5,7 +5,7 @@ Processor Monitor - Daniel Herr Software - +
diff --git a/main/Single_Tab_Zoom.html b/main/Single_Tab_Zoom.html index dd8093d..cdcc954 100644 --- a/main/Single_Tab_Zoom.html +++ b/main/Single_Tab_Zoom.html @@ -5,7 +5,7 @@ Single Tab Zoom - Daniel Herr Software - +
diff --git a/main/Support.html b/main/Support.html index da7625b..a96153d 100644 --- a/main/Support.html +++ b/main/Support.html @@ -4,6 +4,7 @@ + Support - Daniel Herr Software diff --git a/main/index.html b/main/index.html index 81787fe..7ccf929 100644 --- a/main/index.html +++ b/main/index.html @@ -1,9 +1,10 @@ - Daniel Herr Software + + Daniel Herr Software