diff --git a/src/assets/images/cubism/PabloPicasso/FemmeAssise.jpg b/src/assets/images/cubism/PabloPicasso/FemmeAssise.jpg new file mode 100644 index 0000000..efb89a2 Binary files /dev/null and b/src/assets/images/cubism/PabloPicasso/FemmeAssise.jpg differ diff --git a/src/assets/images/paintings/PabloPicasso/LesDemoisellesdAvignon.jpg b/src/assets/images/cubism/PabloPicasso/LesDemoisellesdAvignon.jpg similarity index 100% rename from src/assets/images/paintings/PabloPicasso/LesDemoisellesdAvignon.jpg rename to src/assets/images/cubism/PabloPicasso/LesDemoisellesdAvignon.jpg diff --git a/src/data/categories.js b/src/data/categories.js index f181620..9d28162 100644 --- a/src/data/categories.js +++ b/src/data/categories.js @@ -2,6 +2,7 @@ import { paintingsList } from './list/paintings-list.js'; import { landscapesList } from './list/landscapes-list.js'; import { portraitsList } from './list/portraits-list.js'; import { abstractsList } from './list/abstracts-list.js'; +import { cubismList } from './list/cubism-list.js'; function getRandomItem(list) { return list[Math.floor(Math.random() * list.length)]; @@ -11,6 +12,7 @@ const randomPainting = getRandomItem(paintingsList); const randomLandscape = getRandomItem(landscapesList); const randomPortrait = getRandomItem(portraitsList); const randomAbstract = getRandomItem(abstractsList); +const randomCubism = getRandomItem(cubismList); export const categories = [ { @@ -33,4 +35,9 @@ export const categories = [ imageUrl: randomAbstract.img, tooltip: 'Discover Abstracts', }, + { + name: 'Cubism', + imageUrl: randomCubism.img, + tooltip: 'Discover Cubism', + }, ]; diff --git a/src/data/list/cubism-list.js b/src/data/list/cubism-list.js new file mode 100644 index 0000000..ec85475 --- /dev/null +++ b/src/data/list/cubism-list.js @@ -0,0 +1,35 @@ +import FemmeAssise from '../../assets/images/cubism/PabloPicasso/FemmeAssise.jpg'; +import LesDemoisellesdAvignon from '../../assets/images/cubism/PabloPicasso/LesDemoisellesdAvignon.jpg'; +import { artists } from './artists-list'; + +export const cubismList = [ + { + id: 5001, + name: 'Femme Assise', + img: FemmeAssise, + artist: 'Pablo Picasso', + date: '', + description: '', + location: '', + countryCode: '', + dimensions: '', + style: '', + artistInfo: artists['Pablo Picasso'] || {}, + likes: 9, + }, + { + id: 5002, + name: "Les Demoiselles d'Avignon", + img: LesDemoisellesdAvignon, + artist: 'Pablo Picasso', + date: '1907', + description: + "Les Demoiselles d'Avignon is a groundbreaking work by Pablo Picasso that marks a radical break from traditional composition and perspective. This painting is seen as a precursor to Cubism and a pivotal work in the development of modern art.", + location: 'Museum of Modern Art, New York City, USA', + countryCode: 'US', + dimensions: '243.9 cm x 233.7 cm', + style: 'Cubism', + artistInfo: artists['Pablo Picasso'] || {}, + likes: 19, + }, +]; diff --git a/src/data/list/index.js b/src/data/list/index.js index 1611c83..9bed973 100644 --- a/src/data/list/index.js +++ b/src/data/list/index.js @@ -3,15 +3,18 @@ export * from './landscapes-list'; export * from './portraits-list'; export * from './paintings-list'; export * from './artists-list'; +export * from './cubism-list'; import { abstractsList } from './abstracts-list'; import { portraitsList } from './portraits-list'; import { paintingsList } from './paintings-list'; import { landscapesList } from './landscapes-list'; +import { cubismList } from './cubism-list'; export const allLists = { abstractsList, portraitsList, paintingsList, landscapesList, + cubismList, }; diff --git a/src/data/list/paintings-list.js b/src/data/list/paintings-list.js index a728caa..c348cb7 100644 --- a/src/data/list/paintings-list.js +++ b/src/data/list/paintings-list.js @@ -1,5 +1,4 @@ import Meules from '../../assets/images/paintings/ClaudeMonet/Meules.jpg'; -import LesDemoisellesdAvignon from '../../assets/images/paintings/PabloPicasso/LesDemoisellesdAvignon.jpg'; import GadisPicnic from '../../assets/images/paintings/MiriamOmar/GadisPicnic.png'; import GardenOfJoy from '../../assets/images/paintings/MiriamOmar/GardenOfJoy.png'; import LadyWithAFan from '../../assets/images/paintings/GustavKlimt/LadyWithAFan.jpg'; @@ -27,21 +26,6 @@ export const paintingsList = [ }, { id: 3002, - name: "Les Demoiselles d'Avignon", - img: LesDemoisellesdAvignon, - artist: 'Pablo Picasso', - date: '1907', - description: - "Les Demoiselles d'Avignon is a groundbreaking work by Pablo Picasso that marks a radical break from traditional composition and perspective. This painting is seen as a precursor to Cubism and a pivotal work in the development of modern art.", - location: 'Museum of Modern Art, New York City, USA', - countryCode: 'US', - dimensions: '243.9 cm x 233.7 cm', - style: 'Cubism', - artistInfo: artists['Pablo Picasso'] || {}, - likes: 19, - }, - { - id: 3003, name: 'Garden Of Joy', img: GardenOfJoy, artist: 'Mariam Omar', @@ -56,7 +40,7 @@ export const paintingsList = [ likes: 8, }, { - id: 3004, + id: 3003, name: 'Gadis Picnic', img: GadisPicnic, artist: 'Mariam Omar', @@ -71,7 +55,7 @@ export const paintingsList = [ likes: 11, }, { - id: 3005, + id: 3004, name: 'Lady with A Fan', img: LadyWithAFan, artist: 'Gustav Klimt', @@ -86,7 +70,7 @@ export const paintingsList = [ likes: 18, }, { - id: 3006, + id: 3005, name: 'Nighthawks', img: Nighthawks, artist: 'Edward Hopper', @@ -101,7 +85,7 @@ export const paintingsList = [ likes: 6, }, { - id: 3007, + id: 3006, name: 'Automat', img: Automat, artist: 'Edward Hopper', @@ -116,7 +100,7 @@ export const paintingsList = [ likes: 2, }, { - id: 3008, + id: 3007, name: 'Morning Sun', img: MorningSun, artist: 'Edward Hopper', @@ -131,7 +115,7 @@ export const paintingsList = [ likes: 1, }, { - id: 3009, + id: 3008, name: 'The Ghent Altarpiece', img: TheGhentAltarpiece, artist: 'Jan Van Eyck',