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..e8c9f03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "appersonautomotive.com", - "version": "3.0.0", + "version": "3.0.3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 35dfa48..513983d 100644 --- a/package.json +++ b/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 .", 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/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 = () => ( <>
{
coupon() { // eslint-disable-line class-methods-use-this
return (
+
+
+
+
+
+
@@ -298,7 +298,7 @@ exports[`App component > renders the component 1`] = `
@@ -650,7 +650,7 @@ exports[`App component > renders the component 1`] = `
@@ -666,19 +666,8 @@ exports[`App component > renders the component 1`] = `
class="footerLinks"
style="text-align: center; padding: 6px;"
>
-
-
-
@@ -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(