to main

.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=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "appersonautomotive.com",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "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 .",

src/App/Footer.tsx

@@ -3,10 +3,7 @@ import React from 'react';
 const footerLinks = () => (
   <>
     <div style={{ textAlign: 'center', padding: '6px' }} className="footerLinks">
-      <a aria-label="Facebook" href="https://www.facebook.com/pages/Apperson-Automotive/361511727202422">
-        <i style={{ color: '#45c9ff' }} className="fab fa-facebook-square fa-2x" aria-hidden="true" />
-      </a>
-      <a href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530" style={{ marginLeft: '40px' }}>
+      <a href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530">
         <img
           style={{ marginBottom: '15px', verticalAlign: 'middle' }}
           src="https://insightmg.com/wp-content/uploads/2015/12/YP_Insight-Marketing-Group_Marketing-for-Medical-Practices.png"

src/components/pic-slider.tsx

@@ -5,13 +5,16 @@ import Caption from './PicSlider/caption';
 
 const settings = {
   autoplay: true,
-  autoplaySpeed: 3000,
+  autoplaySpeed: 5000,
   infinite: true,
   speed: 1000,
   slidesToShow: 1,
   slidesToScroll: 1,
   arrows: false,
   fade: true,
+  // even out the first slide's interval (react-slick fade+autoplay quirk
+  // makes the first photo otherwise linger longer than the rest)
+  waitForAnimate: false,
 };
 export interface IpicData {
   _id: string, url: string, title: string, comments: string

src/containers/AutoMaintenance/index.tsx

@@ -24,7 +24,7 @@ export class AutoMaintenance extends Component<AutoMaintenanceProps> {
   coupon() { // eslint-disable-line class-methods-use-this
     return (
       <div style={{ width: '295px', margin: 'auto' }}>
-        <img id="coupon" alt="graphic coupon" src="../static/imgs/banner5.png" />
+        <img id="coupon" alt="graphic coupon" src="/imgs/banner5.png" />
       </div>
     );
   }

src/containers/Contact/NarrowMap.tsx

@@ -45,7 +45,7 @@ const NarrowMap = () => (
         <br />
         Cash and Personal Checks
         <br />
-        <img alt="Accepted Credit Cards" src="/static/imgs/creditCards.gif" />
+        <img alt="Accepted Credit Cards" src="/imgs/creditCards.gif" />
         <br />
         Fleet Maintenance Cards
         <br />

src/containers/Contact/WideMap.tsx

@@ -65,7 +65,7 @@ const WideMap = () => (
         <br />
         Cash and Personal Checks
         <br />
-        <img alt="Accepted Credit Cards" src="/static/imgs/creditCards.gif" />
+        <img alt="Accepted Credit Cards" src="/imgs/creditCards.gif" />
         <br />
         Fleet Maintenance Cards
         <br />

src/containers/GeneralAutoRepair/index.tsx

@@ -29,7 +29,7 @@ export class General extends Component<GeneralAutoRepairProps> {
   coupon() { // eslint-disable-line class-methods-use-this
     return (
       <div style={{ width: '295px', margin: 'auto' }}>
-        <img id="coupon" alt="graphic coupon" src="../static/imgs/banner5.png" />
+        <img id="coupon" alt="graphic coupon" src="/imgs/banner5.png" />
       </div>
     );
   }

src/containers/Homepage/index.tsx

@@ -52,7 +52,7 @@ export class Homepage extends Component<HomepageProps, unknown> {
   coupon() { // eslint-disable-line class-methods-use-this
     return (
       <div style={{ width: '295px', margin: 'auto' }}>
-        <img id="coupon" alt="graphic coupon" src="../static/imgs/banner5.png" />
+        <img id="coupon" alt="graphic coupon" src="/imgs/banner5.png" />
       </div>
     );
   }

src/containers/MajorAutoRepair/index.tsx

@@ -19,7 +19,7 @@ export class Major extends React.Component<MajorAutoProps, unknown> {
   coupon() { // eslint-disable-line class-methods-use-this
     return (
       <div style={{ width: '295px', margin: 'auto' }}>
-        <img id="coupon" alt="graphic coupon" src="../static/imgs/banner5.png" />
+        <img id="coupon" alt="graphic coupon" src="/imgs/banner5.png" />
       </div>
     );
   }

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',

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);
 

static/styles.scss → src/styles/styles.scss

@@ -190,7 +190,7 @@ tbody.regformtbody td {
   color: white;
   font-size: 19pt;
   font-weight: 500;
-  font-family: 'TrajanProRegular', Times, 'Times New Roman', serif;
+  font-family: 'Habibi', sans-serif;
 }
 
 .header-text-card {

test/App/__snapshots__/App.spec.tsx.snap

@@ -256,7 +256,7 @@ exports[`App component > renders the component 1`] = `
 
                                   <img
                                     class="slide-images"
-                                    src="../../static/imgs/photo3.png"
+                                    src="/imgs/photo3.png"
                                   />
 
                                 </div>
@@ -277,7 +277,7 @@ exports[`App component > renders the component 1`] = `
 
                                   <img
                                     class="slide-images"
-                                    src="../../static/imgs/photo4.png"
+                                    src="/imgs/photo4.png"
                                   />
 
                                 </div>
@@ -298,7 +298,7 @@ exports[`App component > renders the component 1`] = `
 
                                   <img
                                     class="slide-images"
-                                    src="../../static/imgs/photo9.png"
+                                    src="/imgs/photo9.png"
                                   />
 
                                 </div>
@@ -650,7 +650,7 @@ exports[`App component > renders the component 1`] = `
                       <img
                         alt="graphic coupon"
                         id="coupon"
-                        src="../static/imgs/banner5.png"
+                        src="/imgs/banner5.png"
                       />
                     </div>
                   </div>
@@ -666,19 +666,8 @@ exports[`App component > renders the component 1`] = `
                 class="footerLinks"
                 style="text-align: center; padding: 6px;"
               >
-                <a
-                  aria-label="Facebook"
-                  href="https://www.facebook.com/pages/Apperson-Automotive/361511727202422"
-                >
-                  <i
-                    aria-hidden="true"
-                    class="fab fa-facebook-square fa-2x"
-                    style="color: rgb(69, 201, 255);"
-                  />
-                </a>
                 <a
                   href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530"
-                  style="margin-left: 40px;"
                 >
                   <img
                     alt="yellowpages"

test/App/__snapshots__/AppTemplate.spec.tsx.snap

@@ -203,19 +203,8 @@ exports[`AppTemplate > calls the mobile menu 1`] = `
               class="footerLinks"
               style="text-align: center; padding: 6px;"
             >
-              <a
-                aria-label="Facebook"
-                href="https://www.facebook.com/pages/Apperson-Automotive/361511727202422"
-              >
-                <i
-                  aria-hidden="true"
-                  class="fab fa-facebook-square fa-2x"
-                  style="color: rgb(69, 201, 255);"
-                />
-              </a>
               <a
                 href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530"
-                style="margin-left: 40px;"
               >
                 <img
                   alt="yellowpages"
@@ -469,19 +458,8 @@ exports[`AppTemplate > renders the component 1`] = `
               class="footerLinks"
               style="text-align: center; padding: 6px;"
             >
-              <a
-                aria-label="Facebook"
-                href="https://www.facebook.com/pages/Apperson-Automotive/361511727202422"
-              >
-                <i
-                  aria-hidden="true"
-                  class="fab fa-facebook-square fa-2x"
-                  style="color: rgb(69, 201, 255);"
-                />
-              </a>
               <a
                 href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530"
-                style="margin-left: 40px;"
               >
                 <img
                   alt="yellowpages"

test/App/__snapshots__/Footer.spec.tsx.snap

@@ -11,19 +11,8 @@ exports[`Footer > renders component 1`] = `
       class="footerLinks"
       style="text-align: center; padding: 6px;"
     >
-      <a
-        aria-label="Facebook"
-        href="https://www.facebook.com/pages/Apperson-Automotive/361511727202422"
-      >
-        <i
-          aria-hidden="true"
-          class="fab fa-facebook-square fa-2x"
-          style="color: rgb(69, 201, 255);"
-        />
-      </a>
       <a
         href="https://www.yellowpages.com/salem-va/mip/apperson-automotive-482421530"
-        style="margin-left: 40px;"
       >
         <img
           alt="yellowpages"

test/components/__snapshots__/picSlider.spec.tsx.snap

@@ -29,7 +29,7 @@ exports[`picture slider component test > renders the component 1`] = `
 
                 <img
                   class="slide-images"
-                  src="../static/imgs/ohaf/slideshow2.png"
+                  src="/imgs/ohaf/slideshow2.png"
                 />
 
                 <div
@@ -57,7 +57,7 @@ exports[`picture slider component test > renders the component 1`] = `
 
                 <img
                   class="slide-images"
-                  src="../static/imgs/ohaf/slideshow3.png"
+                  src="/imgs/ohaf/slideshow3.png"
                 />
 
               </div>
@@ -78,7 +78,7 @@ exports[`picture slider component test > renders the component 1`] = `
 
                 <img
                   class="slide-images"
-                  src="../static/imgs/ohaf/slideshow4.png"
+                  src="/imgs/ohaf/slideshow4.png"
                 />
 
               </div>
@@ -99,7 +99,7 @@ exports[`picture slider component test > renders the component 1`] = `
 
                 <img
                   class="slide-images"
-                  src="../static/imgs/ohaf/slideshow5.png"
+                  src="/imgs/ohaf/slideshow5.png"
                 />
 
               </div>
@@ -120,7 +120,7 @@ exports[`picture slider component test > renders the component 1`] = `
 
                 <img
                   class="slide-images"
-                  src="../static/imgs/ohaf/slideshow6.png"
+                  src="/imgs/ohaf/slideshow6.png"
                 />
 
               </div>

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(<PicSlider data={data} />).container;
     expect(result).toMatchSnapshot();