admin/31745
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firstimageversion

Browse Source
This commit is contained in:
Flatlogic Bot 2025-05-24 19:12:36 +00:00
parent 64324e011d
commit ae999837e7
7 changed files with 36 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app-shell/src/_schema.json
View File

File diff suppressed because one or more lines are too long

88
backend/src/routes/pexels.js
View File

@ -6,21 +6,10 @@ const fetch = require('node-fetch');
const KEY = pexelsKey;
router.get('/image', async (req, res) => {
const headers = {
Authorization: `${KEY}`,
};
const query = pexelsQuery || 'nature';
const orientation = 'portrait';
const perPage = 1;
const url = `https://api.pexels.com/v1/search?query=${query}&orientation=${orientation}&per_page=${perPage}&page=1`;
try {
const response = await fetch(url, { headers });
const data = await response.json();
res.status(200).json(data.photos[0]);
} catch (error) {
res.status(200).json({ error: 'Failed to fetch image' });
}
// Return static Wix image instead of Pexels
res.status(200).json({
src: 'https://static.wixstatic.com/media/42b9b7_87daee7014234d78a8a0766bd8d906bd~mv2.jpeg/v1/crop/x_0,y_186,w_768,h_652/fill/w_768,h_652,al_c,q_85,enc_avif,quality_auto/WhatsApp%20Image%202023-11-07%20at%2019_31_00.jpeg'
});
});
router.get('/video', async (req, res) => {
@ -41,66 +30,21 @@ router.get('/video', async (req, res) => {
}
});
router.get('/multiple-images', async (req, res) => {
const headers = {
Authorization: `${KEY}`,
};
// Return the user-specified static images in random order for all galleries
router.get('/multiple-images', (req, res) => {
const images = [
{ src: 'https://static.wixstatic.com/media/42b9b7_87daee7014234d78a8a0766bd8d906bd~mv2.jpeg/v1/crop/x_0,y_186,w_768,h_652/fill/w_768,h_652,al_c,q_85,enc_avif,quality_auto/WhatsApp%20Image%202023-11-07%20at%2019_31_00.jpeg', photographer: '', photographer_url: '' },
{ src: 'https://static.wixstatic.com/media/42b9b7_3e6e0cf2e71f4fca8c12705c35df1d61~mv2.jpg/v1/crop/x_59,y_0,w_905,h_768/fill/w_850,h_721,al_c,q_85,usm_0.66_1.00_0.01,enc_avif,quality_auto/D29C232E-F61F-46B2-AF8C-1E29C87270C8_L0_001%20(1).jpg', photographer: '', photographer_url: '' },
{ src: 'https://static.wixstatic.com/media/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png/v1/fill/w_529,h_678,al_c,lg_1,q_85,enc_avif,quality_auto/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png', photographer: '', photographer_url: '' }
];
const queries = req.query.queries
? req.query.queries.split(',')
: ['home', 'apple', 'pizza', 'mountains', 'cat'];
const orientation = 'square';
const perPage = 1;
const fallbackImage = {
src: 'https://images.pexels.com/photos/8199252/pexels-photo-8199252.jpeg',
photographer: 'Yan Krukau',
photographer_url: 'https://www.pexels.com/@yankrukov',
};
const fetchFallbackImage = async () => {
try {
const response = await fetch('https://picsum.photos/600');
return {
src: response.url,
photographer: 'Random Picsum',
photographer_url: 'https://picsum.photos/',
};
} catch (error) {
return fallbackImage;
// Shuffle the images array
for (let i = images.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1));
[images[i], images[j]] = [images[j], images[i]];
}
};
const fetchImage = async (query) => {
const url = `https://api.pexels.com/v1/search?query=${query}&orientation=${orientation}&per_page=${perPage}&page=1`;
const response = await fetch(url, { headers });
const data = await response.json();
return data.photos[0] || null;
};
const imagePromises = queries.map((query) => fetchImage(query));
const imagesResults = await Promise.allSettled(imagePromises);
const formattedImages = await Promise.all(
imagesResults.map(async (result) => {
if (result.status === 'fulfilled' && result.value) {
const image = result.value;
return {
src: image.src?.original || fallbackImage.src,
photographer: image.photographer || fallbackImage.photographer,
photographer_url:
image.photographer_url || fallbackImage.photographer_url,
};
} else {
const fallback = await fetchFallbackImage();
return {
src: fallback.src || '',
photographer: fallback.photographer || 'Unknown',
photographer_url: fallback.photographer_url || '',
};
}
}),
);
res.json(formattedImages);
res.json(images);
});
module.exports = router;

2
frontend/src/components/WebPageComponents/HeroComponent/designs/HeroImageBg.tsx
View File

@ -11,7 +11,7 @@ const HeroImageBg = ({
<div
className='relative w-full h-screen flex items-center justify-center text-center mb-24 bg-cover bg-center'
style={{
backgroundImage: `url(${imageHero[0]?.src})`,
backgroundImage: `url('https://static.wixstatic.com/media/42b9b7_04d3e636f03349f28be843bce8350e9f~mv2.png/v1/fill/w_1236,h_896,al_c,q_90,enc_avif,quality_auto/42b9b7_04d3e636f03349f28be843bce8350e9f~mv2.png')`,
}}
>
<div className='absolute inset-0 bg-black opacity-50'></div>

8
frontend/src/helpers/pexels.ts
View File

@ -2,7 +2,7 @@ import axios from 'axios';
export async function getPexelsImage() {
try {
const response = await axios.get(`/pexels/image`);
const response = await axios.get(`/api/pexels/image`);
return response.data;
} catch (error) {
console.error('Error fetching image:', error);
@ -12,7 +12,7 @@ export async function getPexelsImage() {
export async function getPexelsVideo() {
try {
const response = await axios.get(`/pexels/video`);
const response = await axios.get(`/api/pexels/video`);
return response.data;
} catch (error) {
console.error('Error fetching video:', error);
@ -33,6 +33,8 @@ export async function getMultiplePexelsImages(
}
localStorageLock = true;
// Force-clear old Pexels cache to load new Wix images
localStorage.removeItem('pexelsImagesCache');
const cachedImages =
JSON.parse(localStorage.getItem('pexelsImagesCache')) || {};
@ -50,7 +52,7 @@ export async function getMultiplePexelsImages(
const queryString = missingQueries.join(',');
try {
const response = await axios.get(`/pexels/multiple-images`, {
const response = await axios.get(`/api/pexels/multiple-images`, {
params: { queries: queryString },
});

32
frontend/src/pages/index.tsx
View File

@ -20,7 +20,6 @@ import FeaturesSection from '../components/WebPageComponents/FeaturesComponent';
import GalleryPortfolioSection from '../components/WebPageComponents/GalleryPortfolioComponent';
import { getMultiplePexelsImages } from '../helpers/pexels';
import AboutUsSection from '../components/WebPageComponents/AboutUsComponent';
@ -79,32 +78,13 @@ export default function WebSite() {
icon: 'mdiChartLine',
},
];
// Use static Wix images for the gallery
const images = [
{ src: 'https://static.wixstatic.com/media/42b9b7_87daee7014234d78a8a0766bd8d906bd~mv2.jpeg/v1/crop/x_0,y_186,w_768,h_652/fill/w_768,h_652,al_c,q_85,enc_avif,quality_auto/WhatsApp%20Image%202023-11-07%20at%2019_31_00.jpeg' },
{ src: 'https://static.wixstatic.com/media/42b9b7_3e6e0cf2e71f4fca8c12705c35df1d61~mv2.jpg/v1/crop/x_59,y_0,w_905,h_768/fill/w_850,h_721,al_c,q_85,usm_0.66_1.00_0.01,enc_avif,quality_auto/D29C232E-F61F-46B2-AF8C-1E29C87270C8_L0_001%20(1).jpg' },
{ src: 'https://static.wixstatic.com/media/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png/v1/fill/w_529,h_678,al_c,lg_1,q_85,enc_avif,quality_auto/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png' }
];
const [images, setImages] = useState([]);
const pexelsQueriesWebSite = [
'Team building the robot',
'Robotics competition excitement',
'Innovative robot design process',
'Team brainstorming session',
'Celebrating competition success',
];
useEffect(() => {
const fetchImages = async () => {
try {
const images = await getMultiplePexelsImages(pexelsQueriesWebSite);
const formattedImages = (images || []).map((image) => ({
src: image?.src || undefined,
photographer: image?.photographer || undefined,
photographer_url: image?.photographer_url || undefined,
}));
setImages(formattedImages);
} catch (error) {
console.error('Error fetching images:', error);
}
};
fetchImages();
}, []);
return (
<div className='flex flex-col min-h-screen'>

29
frontend/src/pages/web_pages/home.tsx
View File

@ -20,7 +20,6 @@ import FeaturesSection from '../../components/WebPageComponents/FeaturesComponen
import GalleryPortfolioSection from '../../components/WebPageComponents/GalleryPortfolioComponent';
import { getMultiplePexelsImages } from '../../helpers/pexels';
import AboutUsSection from '../../components/WebPageComponents/AboutUsComponent';
@ -59,31 +58,11 @@ export default function WebSite() {
},
];
const [images, setImages] = useState([]);
const pexelsQueriesWebSite = [
'Team building the robot',
'Robotics competition excitement',
'Innovative robot design process',
'Team brainstorming session',
'Celebrating competition success',
const images = [
{ src: 'https://static.wixstatic.com/media/42b9b7_87daee7014234d78a8a0766bd8d906bd~mv2.jpeg/v1/crop/x_0,y_186,w_768,h_652/fill/w_768,h_652,al_c,q_85,enc_avif,quality_auto/WhatsApp%20Image%202023-11-07%20at%2019_31_00.jpeg' },
{ src: 'https://static.wixstatic.com/media/42b9b7_3e6e0cf2e71f4fca8c12705c35df1d61~mv2.jpg/v1/crop/x_59,y_0,w_905,h_768/fill/w_850,h_721,al_c,q_85,usm_0.66_1.00_0.01,enc_avif,quality_auto/D29C232E-F61F-46B2-AF8C-1E29C87270C8_L0_001%20(1).jpg' },
{ src: 'https://static.wixstatic.com/media/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png/v1/fill/w_529,h_678,al_c,lg_1,q_85,enc_avif,quality_auto/42b9b7_b26e4585851c4e60a32d892baff6ca4e~mv2.png' }
];
useEffect(() => {
const fetchImages = async () => {
try {
const images = await getMultiplePexelsImages(pexelsQueriesWebSite);
const formattedImages = (images || []).map((image) => ({
src: image?.src || undefined,
photographer: image?.photographer || undefined,
photographer_url: image?.photographer_url || undefined,
}));
setImages(formattedImages);
} catch (error) {
console.error('Error fetching images:', error);
}
};
fetchImages();
}, []);
return (
<div className='flex flex-col min-h-screen'>

2
frontend/src/stores/scouting/scoutingSlice.ts
View File

@ -74,7 +74,7 @@ export const create = createAsyncThunk(
'scouting/createScouting',
async (data: any, { rejectWithValue }) => {
try {
const result = await axios.post('scouting', { data });
const result = await axios.post('/api/scouting', { data }, { withCredentials: true });
return result.data;
} catch (error) {
if (!error.response) {