From 10503a4ee7012ad3b4b3baa2c4a9d1280d76d30f Mon Sep 17 00:00:00 2001 From: JoshuaVSherman Date: Fri, 29 May 2026 19:19:39 -0400 Subject: [PATCH 1/3] chore: update .env.example BUILD_BRANCH master->main Reflects the master->main branch rename. BUILD_BRANCH is a template default in .env.example only; not consumed by committed code. Co-Authored-By: Claude Opus 4.8 --- .env.example | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 4ca6df9..794be1f 100644 --- a/.env.example +++ b/.env.example @@ -5,5 +5,5 @@ GoogleClientId= AuthProductionBaseURL=https:/web-jam-back-dev.herokuapp.com userRoles={"roles" : ["Rolename1", "Rolename2"]} AllowUrl={"urls": ["http://something.com", "https://something.com", "http://localhost:7000", "http://localhost:9000"]} -BUILD_BRANCH=master +BUILD_BRANCH=main HashString= diff --git a/package-lock.json b/package-lock.json index f93cef6..2fbba71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 35dfa48..8720c2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appersonautomotive.com", - "version": "3.0.1", + "version": "3.0.2", "description": "appersonautomotive.com", "main": "dist/index.html", "repository": { From 5e5fba4e4083f9f0201869f7306ee269ac08d5cc Mon Sep 17 00:00:00 2001 From: JoshuaVSherman Date: Thu, 4 Jun 2026 20:38:27 -0400 Subject: [PATCH 2/3] fix(assets): serve images from public/ and move styles into src/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maria's Apperson review #1/#4/#5: the coupon graphic, several slideshow photos, and the "Accepted Credit Cards" graphic were broken because they lived in static/imgs/ — which nothing serves (Vite serves public/, server.js serves dist/, and the build never copied static/). Every static/imgs/... URL 404'd, so the browser showed alt text instead. - Move static/imgs/* -> public/imgs/ (Vite serves it at /imgs/...); the build now emits them into dist/imgs/ for prod - Update all refs: ../static/imgs/X, ../../static/imgs/X, /static/imgs/X -> /imgs/X - Move static/*.scss -> src/styles/ to match the other frontends; fix the main.tsx import - Drop the duplicate static/favicon.ico (public/favicon.ico kept) - Delete static/; update package.json files list + point stylelint at src/ Fixes the missing coupon (#1), local slideshow photos (#4), and credit cards graphic (#5). Remaining review items (#2 fonts, #3 slideshow timing, #6 Facebook link) are separate follow-ups. Co-Authored-By: Claude Opus 4.8 --- package-lock.json | 4 ++-- package.json | 5 ++--- {static => public}/imgs/banner1.jpg | Bin {static => public}/imgs/banner2.jpg | Bin {static => public}/imgs/banner3.jpg | Bin {static => public}/imgs/banner4.jpg | Bin {static => public}/imgs/banner5.png | Bin {static => public}/imgs/creditCards.gif | Bin {static => public}/imgs/photo3.png | Bin {static => public}/imgs/photo4.png | Bin {static => public}/imgs/photo9.png | Bin src/containers/AutoMaintenance/index.tsx | 2 +- src/containers/Contact/NarrowMap.tsx | 2 +- src/containers/Contact/WideMap.tsx | 2 +- src/containers/GeneralAutoRepair/index.tsx | 2 +- src/containers/Homepage/index.tsx | 2 +- src/containers/MajorAutoRepair/index.tsx | 2 +- src/lib/slides.tsx | 6 +++--- src/main.tsx | 2 +- {static => src/styles}/_config.scss | 0 {static => src/styles}/_footer.scss | 0 {static => src/styles}/_home.scss | 0 {static => src/styles}/_materialui.scss | 0 {static => src/styles}/_menu.scss | 0 {static => src/styles}/_mobile.scss | 0 {static => src/styles}/_news.scss | 0 {static => src/styles}/_slideshow.scss | 0 {static => src/styles}/styles.scss | 0 static/favicon.ico | Bin 1150 -> 0 bytes test/App/__snapshots__/App.spec.tsx.snap | 8 ++++---- .../__snapshots__/picSlider.spec.tsx.snap | 10 +++++----- test/components/picSlider.spec.tsx | 10 +++++----- 32 files changed, 28 insertions(+), 29 deletions(-) rename {static => public}/imgs/banner1.jpg (100%) rename {static => public}/imgs/banner2.jpg (100%) rename {static => public}/imgs/banner3.jpg (100%) rename {static => public}/imgs/banner4.jpg (100%) rename {static => public}/imgs/banner5.png (100%) rename {static => public}/imgs/creditCards.gif (100%) rename {static => public}/imgs/photo3.png (100%) rename {static => public}/imgs/photo4.png (100%) rename {static => public}/imgs/photo9.png (100%) rename {static => src/styles}/_config.scss (100%) rename {static => src/styles}/_footer.scss (100%) rename {static => src/styles}/_home.scss (100%) rename {static => src/styles}/_materialui.scss (100%) rename {static => src/styles}/_menu.scss (100%) rename {static => src/styles}/_mobile.scss (100%) rename {static => src/styles}/_news.scss (100%) rename {static => src/styles}/_slideshow.scss (100%) rename {static => src/styles}/styles.scss (100%) delete mode 100644 static/favicon.ico diff --git a/package-lock.json b/package-lock.json index f93cef6..67f1b80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 35dfa48..02cd84c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appersonautomotive.com", - "version": "3.0.1", + "version": "3.0.2", "description": "appersonautomotive.com", "main": "dist/index.html", "repository": { @@ -14,7 +14,6 @@ "files": [ "vite.config.ts", "src/", - "static/", "public/" ], "keywords": [ @@ -31,7 +30,7 @@ "build": "vite build", "preview": "vite preview", "typecheck": "tsc --noEmit", - "test:stylelint": "stylelint \"static/**/*.scss\"", + "test:stylelint": "stylelint \"src/**/*.scss\"", "lint:fix": "eslint . --fix", "test:lint-fix": "npm run test:stylelint && npm run lint:fix", "test:lint": "npm run test:stylelint && eslint .", diff --git a/static/imgs/banner1.jpg b/public/imgs/banner1.jpg similarity index 100% rename from static/imgs/banner1.jpg rename to public/imgs/banner1.jpg diff --git a/static/imgs/banner2.jpg b/public/imgs/banner2.jpg similarity index 100% rename from static/imgs/banner2.jpg rename to public/imgs/banner2.jpg diff --git a/static/imgs/banner3.jpg b/public/imgs/banner3.jpg similarity index 100% rename from static/imgs/banner3.jpg rename to public/imgs/banner3.jpg diff --git a/static/imgs/banner4.jpg b/public/imgs/banner4.jpg similarity index 100% rename from static/imgs/banner4.jpg rename to public/imgs/banner4.jpg diff --git a/static/imgs/banner5.png b/public/imgs/banner5.png similarity index 100% rename from static/imgs/banner5.png rename to public/imgs/banner5.png diff --git a/static/imgs/creditCards.gif b/public/imgs/creditCards.gif similarity index 100% rename from static/imgs/creditCards.gif rename to public/imgs/creditCards.gif diff --git a/static/imgs/photo3.png b/public/imgs/photo3.png similarity index 100% rename from static/imgs/photo3.png rename to public/imgs/photo3.png diff --git a/static/imgs/photo4.png b/public/imgs/photo4.png similarity index 100% rename from static/imgs/photo4.png rename to public/imgs/photo4.png diff --git a/static/imgs/photo9.png b/public/imgs/photo9.png similarity index 100% rename from static/imgs/photo9.png rename to public/imgs/photo9.png diff --git a/src/containers/AutoMaintenance/index.tsx b/src/containers/AutoMaintenance/index.tsx index 3dc75b0..b544572 100644 --- a/src/containers/AutoMaintenance/index.tsx +++ b/src/containers/AutoMaintenance/index.tsx @@ -24,7 +24,7 @@ export class AutoMaintenance extends Component { coupon() { // eslint-disable-line class-methods-use-this return (
- graphic coupon + graphic coupon
); } diff --git a/src/containers/Contact/NarrowMap.tsx b/src/containers/Contact/NarrowMap.tsx index 25d741e..9b90f77 100644 --- a/src/containers/Contact/NarrowMap.tsx +++ b/src/containers/Contact/NarrowMap.tsx @@ -45,7 +45,7 @@ const NarrowMap = () => (
Cash and Personal Checks
- Accepted Credit Cards + Accepted Credit Cards
Fleet Maintenance Cards
diff --git a/src/containers/Contact/WideMap.tsx b/src/containers/Contact/WideMap.tsx index 870e6d7..7ba1d6a 100644 --- a/src/containers/Contact/WideMap.tsx +++ b/src/containers/Contact/WideMap.tsx @@ -65,7 +65,7 @@ const WideMap = () => (
Cash and Personal Checks
- Accepted Credit Cards + Accepted Credit Cards
Fleet Maintenance Cards
diff --git a/src/containers/GeneralAutoRepair/index.tsx b/src/containers/GeneralAutoRepair/index.tsx index d6770b3..096eec2 100644 --- a/src/containers/GeneralAutoRepair/index.tsx +++ b/src/containers/GeneralAutoRepair/index.tsx @@ -29,7 +29,7 @@ export class General extends Component { coupon() { // eslint-disable-line class-methods-use-this return (
- graphic coupon + graphic coupon
); } diff --git a/src/containers/Homepage/index.tsx b/src/containers/Homepage/index.tsx index 90f9cc2..a3417f8 100644 --- a/src/containers/Homepage/index.tsx +++ b/src/containers/Homepage/index.tsx @@ -52,7 +52,7 @@ export class Homepage extends Component { coupon() { // eslint-disable-line class-methods-use-this return (
- graphic coupon + graphic coupon
); } diff --git a/src/containers/MajorAutoRepair/index.tsx b/src/containers/MajorAutoRepair/index.tsx index 5760dcd..305e14b 100644 --- a/src/containers/MajorAutoRepair/index.tsx +++ b/src/containers/MajorAutoRepair/index.tsx @@ -19,7 +19,7 @@ export class Major extends React.Component { coupon() { // eslint-disable-line class-methods-use-this return (
- graphic coupon + graphic coupon
); } diff --git a/src/lib/slides.tsx b/src/lib/slides.tsx index fdb8344..6505a0e 100644 --- a/src/lib/slides.tsx +++ b/src/lib/slides.tsx @@ -3,9 +3,9 @@ export default [ _id: '2', url: 'https://dl.dropboxusercontent.com/scl/fi/q83bcnvyyla2zavixfc5m/2-Jimmy-sized.jpg?rlkey=wecrucndun8vtj9gxcblo42l1&dl=0', }, - { _id: '3', url: '../../static/imgs/photo3.png' }, - { _id: '4', url: '../../static/imgs/photo4.png' }, - { _id: '9', url: '../../static/imgs/photo9.png' }, + { _id: '3', url: '/imgs/photo3.png' }, + { _id: '4', url: '/imgs/photo4.png' }, + { _id: '9', url: '/imgs/photo9.png' }, { _id: '10', url: 'https://dl.dropboxusercontent.com/scl/fi/qmy8rex28nlhgdv1qblqo/5-red-truck-lifted-sized.jpg?rlkey=j10z4papyvkcwc5tt8vz3hyiv&dl=0', diff --git a/src/main.tsx b/src/main.tsx index d299c3b..125db9d 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,7 +1,7 @@ import { StrictMode } from 'react'; import { createRoot } from 'react-dom/client'; import { App } from './App'; -import '../static/styles.scss'; +import './styles/styles.scss'; const root = createRoot(document.getElementById('root') as HTMLElement); diff --git a/static/_config.scss b/src/styles/_config.scss similarity index 100% rename from static/_config.scss rename to src/styles/_config.scss diff --git a/static/_footer.scss b/src/styles/_footer.scss similarity index 100% rename from static/_footer.scss rename to src/styles/_footer.scss diff --git a/static/_home.scss b/src/styles/_home.scss similarity index 100% rename from static/_home.scss rename to src/styles/_home.scss diff --git a/static/_materialui.scss b/src/styles/_materialui.scss similarity index 100% rename from static/_materialui.scss rename to src/styles/_materialui.scss diff --git a/static/_menu.scss b/src/styles/_menu.scss similarity index 100% rename from static/_menu.scss rename to src/styles/_menu.scss diff --git a/static/_mobile.scss b/src/styles/_mobile.scss similarity index 100% rename from static/_mobile.scss rename to src/styles/_mobile.scss diff --git a/static/_news.scss b/src/styles/_news.scss similarity index 100% rename from static/_news.scss rename to src/styles/_news.scss diff --git a/static/_slideshow.scss b/src/styles/_slideshow.scss similarity index 100% rename from static/_slideshow.scss rename to src/styles/_slideshow.scss diff --git a/static/styles.scss b/src/styles/styles.scss similarity index 100% rename from static/styles.scss rename to src/styles/styles.scss diff --git a/static/favicon.ico b/static/favicon.ico deleted file mode 100644 index 883f7e29a03e8d3d5a4fb7ca3d3d3fea039dcf82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmbVMNoZ416#arbH^qf(H&ziXbhhb`skF9D2d%@xp&%+EE?iU`!C|4e5tUl1r4>cR zqJkS;iz`92Q<|9O5AXf=lBOtBMX+5R&--c6wS@Cu-upTCoO9nLmbHeTvNDU$jn;{^ zmbJmMtStnOcv3v)Vp)8*eq9m4o{zcdW$cbC>>>JFeRMV|#A_8|RT9xkAFcKLUhAWA zyF^X7K=me~Tq0EABQ?8%}?a6ozB6N8bWDYy<{U1buc<4A(aX+G2x0i@&$$G&y9YG{~J9~fj+|IXxkxhWS@ZJ=IKGf z@eEIMuQ6{I`OltGzudtW`cF>%4!DNj6BbC&OPoD>{X#=8Xyk|+*KAxqE1>g=dxa;D z|MF)IKVtNmA;?kW51ur6HS&uZj~+QVdcc9wtjQV=#~oB|`bR(Fp_lsI)bDDN=p;It zJiLEL{es4)DIeztvzX6Pzu;r^0r}8-f!v~xd&5~&v45G=axi~= zG5U{tf&U_3qKjD~^l*PjK`r=5&r75Txgaq#L_X)I)c;*E_K)Z``Yo$Hpoi8v!MPQf z%P1r>0y8Pzs}i_#JBw<=PnYhG{^_BceN0f-`0r@s+9VLIaq;RU?|sQfMo1KXNZh4< zaQ|ugXa3%pOBlZCoyXn_>?GgRh}U^I)bHZTB@gEYU0lBC;_!YOJGQw<&zbz>N8P}` nnZpvloi*A+UVvDwhY)|?u+2jq=RU+WT;(C1Tt?}C;D6UYvLEK= diff --git a/test/App/__snapshots__/App.spec.tsx.snap b/test/App/__snapshots__/App.spec.tsx.snap index 4ec01d1..f909efc 100644 --- a/test/App/__snapshots__/App.spec.tsx.snap +++ b/test/App/__snapshots__/App.spec.tsx.snap @@ -256,7 +256,7 @@ exports[`App component > renders the component 1`] = ` @@ -277,7 +277,7 @@ exports[`App component > renders the component 1`] = ` @@ -298,7 +298,7 @@ exports[`App component > renders the component 1`] = ` @@ -650,7 +650,7 @@ exports[`App component > renders the component 1`] = ` graphic coupon diff --git a/test/components/__snapshots__/picSlider.spec.tsx.snap b/test/components/__snapshots__/picSlider.spec.tsx.snap index 3a4ed27..002f98d 100644 --- a/test/components/__snapshots__/picSlider.spec.tsx.snap +++ b/test/components/__snapshots__/picSlider.spec.tsx.snap @@ -29,7 +29,7 @@ exports[`picture slider component test > renders the component 1`] = `
renders the component 1`] = `
@@ -78,7 +78,7 @@ exports[`picture slider component test > renders the component 1`] = ` @@ -99,7 +99,7 @@ exports[`picture slider component test > renders the component 1`] = ` @@ -120,7 +120,7 @@ exports[`picture slider component test > renders the component 1`] = ` diff --git a/test/components/picSlider.spec.tsx b/test/components/picSlider.spec.tsx index a7ba6d7..722818a 100644 --- a/test/components/picSlider.spec.tsx +++ b/test/components/picSlider.spec.tsx @@ -4,11 +4,11 @@ import { PicSlider } from 'src/components/pic-slider'; describe('picture slider component test', () => { it('renders the component', () => { const data:any = [ - { _id: 1, url: '../static/imgs/ohaf/slideshow2.png', comments: 'showCaption' }, - { _id: 2, url: '../static/imgs/ohaf/slideshow3.png' }, - { _id: 3, url: '../static/imgs/ohaf/slideshow4.png' }, - { _id: 4, url: '../static/imgs/ohaf/slideshow5.png' }, - { _id: 5, url: '../static/imgs/ohaf/slideshow6.png' }, + { _id: 1, url: '/imgs/ohaf/slideshow2.png', comments: 'showCaption' }, + { _id: 2, url: '/imgs/ohaf/slideshow3.png' }, + { _id: 3, url: '/imgs/ohaf/slideshow4.png' }, + { _id: 4, url: '/imgs/ohaf/slideshow5.png' }, + { _id: 5, url: '/imgs/ohaf/slideshow6.png' }, ]; const result = render().container; expect(result).toMatchSnapshot(); From 7d3b8000dd459fb618f8367305c867f5f3b78fb5 Mon Sep 17 00:00:00 2001 From: JoshuaVSherman Date: Thu, 4 Jun 2026 20:47:55 -0400 Subject: [PATCH 3/3] fix(ui): unify header font, slow slideshow, remove Facebook link Remaining Apperson review items: - #2 .header-text used TrajanProRegular (never loaded) -> fell back to serif/Times; switch to the loaded Habibi sans-serif so all text matches - #3 slideshow autoplaySpeed 3000 -> 5000 (slower) and waitForAnimate:false so the first photo no longer lingers longer than the rest - #6 remove the Facebook link (Unofficial page, no header image, one post) Co-Authored-By: Claude Opus 4.8 --- package.json | 2 +- src/App/Footer.tsx | 5 +---- src/components/pic-slider.tsx | 5 ++++- src/styles/styles.scss | 2 +- test/App/__snapshots__/App.spec.tsx.snap | 11 ---------- .../__snapshots__/AppTemplate.spec.tsx.snap | 22 ------------------- test/App/__snapshots__/Footer.spec.tsx.snap | 11 ---------- 7 files changed, 7 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 02cd84c..513983d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "appersonautomotive.com", - "version": "3.0.2", + "version": "3.0.3", "description": "appersonautomotive.com", "main": "dist/index.html", "repository": { diff --git a/src/App/Footer.tsx b/src/App/Footer.tsx index a569590..8df98d5 100644 --- a/src/App/Footer.tsx +++ b/src/App/Footer.tsx @@ -3,10 +3,7 @@ import React from 'react'; const footerLinks = () => ( <>