From eeeb879e5092f229dd1f1ae4673545afb3bc2869 Mon Sep 17 00:00:00 2001 From: David Olsson Date: Wed, 17 Feb 2021 20:08:31 +0100 Subject: [PATCH 1/4] Add Norwegian stores elkjop, komplett, dustin, power and proshop --- src/store/model/dustinhome-no.ts | 76 ++++ src/store/model/elkjop.ts | 77 ++++ src/store/model/index.ts | 10 + src/store/model/komplett-no.ts | 263 +++++++++++++ src/store/model/power-no.ts | 100 +++++ src/store/model/proshop-no.ts | 617 +++++++++++++++++++++++++++++++ 6 files changed, 1143 insertions(+) create mode 100644 src/store/model/dustinhome-no.ts create mode 100644 src/store/model/elkjop.ts create mode 100644 src/store/model/komplett-no.ts create mode 100644 src/store/model/power-no.ts create mode 100644 src/store/model/proshop-no.ts diff --git a/src/store/model/dustinhome-no.ts b/src/store/model/dustinhome-no.ts new file mode 100644 index 0000000000..126c015f1e --- /dev/null +++ b/src/store/model/dustinhome-no.ts @@ -0,0 +1,76 @@ +import {Store} from './store'; + +export const DustinHomeNO: Store = { + currency: 'kr.', + labels: { + inStock: { + container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', + text: ['Kan sendes omgående'], + }, + maxPrice: { + container: + '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.product-pricing.product-page-b-test.ng-star-inserted > div.price-block > div > div > div > span', + }, + outOfStock: { + container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', + text: ['Vi venter produktet til lager, men har foreløpig ingen bekreftet leveringsdato. Vi sender produktet så snart det er på lager.'], + }, + }, + links: [ + { + brand: 'test:brand', + model: 'test:model', + series: 'test:series', + url: 'https://www.dustinhome.no/product/5011216501/', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3080', + url: 'https://www.dustinhome.no/product/5011216707/', + }, + { + brand: 'evga', + model: 'ftw3 ultra', + series: '3080', + url: 'https://www.dustinhome.no/product/5011197759/', + }, + { + brand: 'evga', + model: 'ftw3', + series: '3080', + url: 'https://www.dustinhome.no/product/5011197760/', + }, + { + brand: 'evga', + model: 'xc3 ultra', + series: '3080', + url: 'https://www.dustinhome.no/product/5011197756/', + }, + { + brand: 'pny', + model: 'xlr8 epic x', + series: '3080', + url: 'https://www.dustinhome.no/product/5011196134/', + }, + { + brand: 'pny', + model: 'xlr8 epic x', + series: '3080', + url: 'https://www.dustinhome.no/product/5011196133/', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme waterforce wb', + series: '3080', + url: 'https://www.dustinhome.no/product/5011212484/', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3080', + url: 'https://www.dustinhome.no/product/5011199977/', + }, + ], + name: 'dustinhome-no', +}; diff --git a/src/store/model/elkjop.ts b/src/store/model/elkjop.ts new file mode 100644 index 0000000000..6071d04341 --- /dev/null +++ b/src/store/model/elkjop.ts @@ -0,0 +1,77 @@ +import {Store} from './store'; + +export const Elkjop: Store = { + currency: 'kr.', + labels: { + inStock: { + container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', + text: ['Legg i handlevogn'], + }, + maxPrice: { + container: 'div.product-price-container > span', + euroFormat: false, + }, + outOfStock: { + container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', + text: ['Ikke tilgjengelig'], + }, + }, + links: [ + { + brand: 'test:brand', + model: 'test:model', + series: 'test:series', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', + }, + { + brand: 'pny', + model: 'xlr8 epic x', + series: '3090', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/215370/pny-rtx-3090-24gb-xlr8-gaming-epic-x-rgb-3-fan-2-7slot', + }, + { + brand: 'evga', + model: 'ftw3 ultra', + series: '3080', + url: 'https://www.dustinhome.no/product/5011197759/', + }, + { + brand: 'evga', + model: 'xc3', + series: '3080', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218419/evga-geforce-rtx-3080-xc3', + }, + { + brand: 'evga', + model: 'xc3 black', + series: '3080', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', + }, + { + brand: 'evga', + model: 'ftw3', + series: '3080', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/220655/evga-geforce-rtx-3080-ftw3', + }, + { + brand: 'palit', + model: 'gaming pro oc', + series: '3080', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222470/geforce-rtx-3080-gamingpro-oc', + }, + { + brand: 'gainward', + model: 'phoenix gs', + series: '3080', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222467/geforce-rtx-3080-phoenix-gs', + }, + { + brand: 'evga', + model: 'xc3 ultra', + series: '3090', + url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/224771/evga-geforce-rtx-3090-xc3-ultra-24gb', + }, + + ], + name: 'elkjop', +}; diff --git a/src/store/model/index.ts b/src/store/model/index.ts index 6f6156a1cd..688a448efd 100644 --- a/src/store/model/index.ts +++ b/src/store/model/index.ts @@ -51,9 +51,11 @@ import {Currys} from './currys'; import {Cyberport} from './cyberport'; import {Dcomp} from './dcomp'; import {Drako} from './drako'; +import {DustinHomeNO} from './dustinhome-no'; import {EbGames} from './ebgames'; import {Ebuyer} from './ebuyer'; import {Elcorteingles} from './elcorteingles'; +import {Elkjop} from './elkjop'; import {Eprice} from './eprice'; import {Equippr} from './equippr'; import {Euronics} from './euronics'; @@ -75,6 +77,7 @@ import {HarveyNormanIE} from './harveynorman-ie'; import {Igamecomputer} from './igame'; import {JohnLewis} from './johnlewis'; import {Kabum} from './kabum'; +import {KomplettNO} from './komplett-no'; import {LandmarkComputers} from './lmc'; import {Mediamarkt} from './mediamarkt'; import {Medimax} from './medimax'; @@ -104,8 +107,10 @@ import {PCKing} from './pcking'; import {Pccg} from './pccg'; import {PlayStation} from './playstation'; import {Pny} from './pny'; +import {PowerNO} from './power-no'; import {ProshopDE} from './proshop-de'; import {ProshopDK} from './proshop-dk'; +import {ProshopNO} from './proshop-no'; import {Rosman} from './rosman'; import {RosmanMelb} from './rosman-melb'; import {Saturn} from './saturn'; @@ -188,9 +193,11 @@ export const storeList = new Map([ [Cyberport.name, Cyberport], [Dcomp.name, Dcomp], [Drako.name, Drako], + [DustinHomeNO.name, DustinHomeNO], [EbGames.name, EbGames], [Ebuyer.name, Ebuyer], [Elcorteingles.name, Elcorteingles], + [Elkjop.name, Elkjop], [Eprice.name, Eprice], [Equippr.name, Equippr], [Euronics.name, Euronics], @@ -212,6 +219,7 @@ export const storeList = new Map([ [Igamecomputer.name, Igamecomputer], [JohnLewis.name, JohnLewis], [Kabum.name, Kabum], + [KomplettNO.name, KomplettNO], [LandmarkComputers.name, LandmarkComputers], [Mediamarkt.name, Mediamarkt], [Medimax.name, Medimax], @@ -241,8 +249,10 @@ export const storeList = new Map([ [PCComponentes.name, PCComponentes], [PlayStation.name, PlayStation], [Pny.name, Pny], + [PowerNO.name, PowerNO], [ProshopDE.name, ProshopDE], [ProshopDK.name, ProshopDK], + [ProshopNO.name, ProshopNO], [Rosman.name, Rosman], [RosmanMelb.name, RosmanMelb], [Saturn.name, Saturn], diff --git a/src/store/model/komplett-no.ts b/src/store/model/komplett-no.ts new file mode 100644 index 0000000000..530ea66625 --- /dev/null +++ b/src/store/model/komplett-no.ts @@ -0,0 +1,263 @@ +import {Store} from './store'; + +export const KomplettNO: Store = { + currency: 'kr.', + labels: { + inStock: { + container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.product-main-info-buy-button > div.buy-button > button', + text: ['LEGG I HANDLEVOGN'], + }, + maxPrice: { + container: + '.product-price > span[class="product-price-now"]', + }, + outOfStock: { + container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.subscribe-product-container > div > div > button', + text: ['MOTTA VARSEL'], + }, + }, + links: [ + { + brand: 'test:brand', + model: 'test:model', + series: 'test:series', + url: 'https://www.komplett.no/product/1168415/', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3080', + url: 'https://www.komplett.no/product/1168380/', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3080', + url: 'https://www.komplett.no/product/1173669', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3080', + url: 'https://www.komplett.no/product/1168379/', + }, + { + brand: 'asus', + model: 'strix', + series: '3080', + url: 'https://www.komplett.no/product/1168439/', + }, + { + brand: 'asus', + model: 'tuf', + series: '3080', + url: 'https://www.komplett.no/product/1168358/', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3080', + url: 'https://www.komplett.no/product/1168436/', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3080', + url: 'https://www.komplett.no/product/1176247/', + }, + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3080', + url: 'https://www.komplett.no/product/1168419', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3080', + url: 'https://www.komplett.no/product/1171562', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3080', + url: 'https://www.komplett.no/product/1168418', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3080', + url: 'https://www.komplett.no/product/1175718', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3080', + url: 'https://www.komplett.no/product/1168415', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme', + series: '3080', + url: 'https://www.komplett.no/product/1168416', + }, + { + brand: 'gainward', + model: 'phantom gs', + series: '3080', + url: 'https://www.komplett.no/product/1171801', + }, + { + brand: 'gainward', + model: 'phantom gs', + series: '3080', + url: 'https://www.komplett.no/product/1171798', + }, + { + brand: 'gainward', + model: 'phoenix gs', + series: '3080', + url: 'https://www.komplett.no/product/1168422', + }, + { + brand: 'gainward', + model: 'phoenix', + series: '3080', + url: 'https://www.komplett.no/product/1168129', + }, + { + brand: 'zotac', + model: 'trinity', + series: '3080', + url: 'https://www.komplett.no/product/1168398', + }, + { + brand: 'zotac', + model: 'amp holo', + series: '3080', + url: 'https://www.komplett.no/product/1170425', + }, + { + brand: 'palit', + model: 'gaming pro', + series: '3080', + url: 'https://www.komplett.no/product/1168128', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3090', + url: 'https://www.komplett.no/product/1168378/', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3090', + url: 'https://www.komplett.no/product/1173670', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3090', + url: 'https://www.komplett.no/product/1168381/', + }, + { + brand: 'asus', + model: 'ekwb', + series: '3090', + url: 'https://www.komplett.no/product/1174234', + }, + { + brand: 'asus', + model: 'strix oc white', + series: '3090', + url: 'https://www.komplett.no/product/1176245', + }, + { + brand: 'asus', + model: 'tuf', + series: '3090', + url: 'https://www.komplett.no/product/1168359', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3090', + url: 'https://www.komplett.no/product/1168438', + }, + { + brand: 'asus', + model: 'tuf oc', + series: '3090', + url: 'https://www.komplett.no/product/1168490', + }, + { + brand: 'asus', + model: 'strix', + series: '3090', + url: 'https://www.komplett.no/product/1168437', + }, + + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3090', + url: 'https://www.komplett.no/product/1168414', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3090', + url: 'https://www.komplett.no/product/1173940', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3090', + url: 'https://www.komplett.no/product/1168417', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3090', + url: 'https://www.komplett.no/product/1168412', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme', + series: '3090', + url: 'https://www.komplett.no/product/1168413', + }, + { + brand: 'gigabyte', + model: 'turbo', + series: '3090', + url: 'https://www.komplett.no/product/1171270', + }, + { + brand: 'palit', + model: 'gamerock oc', + series: '3090', + url: 'https://www.komplett.no/product/1171795', + }, + { + brand: 'palit', + model: 'gamerock', + series: '3090', + url: 'https://www.komplett.no/product/1171802', + }, + { + brand: 'palit', + model: 'gaming pro', + series: '3090', + url: 'https://www.komplett.no/product/1168127', + }, + { + brand: 'asus', + model: 'ekwb', + series: '3070', + url: 'https://www.komplett.no/product/1174234', + }, + ], + name: 'komplett-no', +}; diff --git a/src/store/model/power-no.ts b/src/store/model/power-no.ts new file mode 100644 index 0000000000..20af5e3565 --- /dev/null +++ b/src/store/model/power-no.ts @@ -0,0 +1,100 @@ +import {Store} from './store'; + +export const PowerNO: Store = { + currency: 'kr.', + labels: { + inStock: { + container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div.buy-area__webshop > button', + text: ['Legg til handlekurv'], + }, + maxPrice: { + container: + '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.product-pricing.product-page-b-test.ng-star-inserted > div.price-block > div > div > div > span', + }, + outOfStock: { + container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div > button', + text: ['Ikke på lager'], + }, + }, + links: [ + { + brand: 'test:brand', + model: 'test:model', + series: 'test:series', + url: 'https://www.power.no/data-og-tilbehoer/p-1128968/', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1118420/', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1118419/', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1145753/', + }, + { + brand: 'asus', + model: 'tuf', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1115923/', + }, + { + brand: 'asus', + model: 'strix', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1117755/', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1141929/', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1141928/', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1121308/', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1121307/', + }, + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1118416/', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1118415/', + }, + { + brand: 'pny', + model: 'xlr8 epic x', + series: '3080', + url: 'https://www.power.no/data-og-tilbehoer/p-1128968/', + }, + ], + name: 'power-no', +}; diff --git a/src/store/model/proshop-no.ts b/src/store/model/proshop-no.ts new file mode 100644 index 0000000000..c876a7e575 --- /dev/null +++ b/src/store/model/proshop-no.ts @@ -0,0 +1,617 @@ +import {Store} from './store'; + +export const ProshopNO: Store = { + currency: 'kr.', + labels: { + inStock: { + container: '.site-stock', + text: ['1-3 dager til levering', 'Fjernlager'], + }, + maxPrice: { + container: + '.site-currency-wrapper > span[class="site-currency-attention"]', + euroFormat: true, + }, + outOfStock: { + container: '.site-stock', + text: ['Bestilt'], + }, + }, + links: [ + { + brand: 'test:brand', + model: 'test:model', + series: 'test:series', + url: 'https://www.proshop.no/2694767', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3060ti', + url: 'https://www.proshop.no/2910054', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3060ti', + url: 'https://www.proshop.no/2910052', + }, + { + brand: 'msi', + model: 'ventus 2x oc', + series: '3060ti', + url: 'https://www.proshop.no/2911560', + }, + { + brand: 'asus', + model: 'tuf oc', + series: '3060ti', + url: 'https://www.proshop.no/2886986', + }, + { + brand: 'inno3d', + model: 'twin x2', + series: '3060ti', + url: 'https://www.proshop.no/2911556', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3060ti', + url: 'https://www.proshop.no/2886982', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3060ti', + url: 'https://www.proshop.no/2887734', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3060ti', + url: 'https://www.proshop.no/2887735', + }, + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3060ti', + url: 'https://www.proshop.no/2887737', + }, + { + brand: 'asus', + model: 'dual', + series: '3060ti', + url: 'https://www.proshop.no/2886988', + }, + { + brand: 'gigabyte', + model: 'gaming oc pro', + series: '3060ti', + url: 'https://www.proshop.no/2887738', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3060ti', + url: 'https://www.proshop.no/2887736', + }, + { + brand: 'inno3d', + model: 'ichill x3', + series: '3060ti', + url: 'https://www.proshop.no/2908274', + }, + { + brand: 'asus', + model: 'tuf', + series: '3060ti', + url: 'https://www.proshop.no/2886984', + }, + { + brand: 'inno3d', + model: 'twin x2 oc', + series: '3060ti', + url: 'https://www.proshop.no/2908273', + }, + { + brand: 'asus', + model: 'dual oc', + series: '3060ti', + url: 'https://www.proshop.no/2886990', + }, + { + brand: 'asus', + model: 'dual mini', + series: '3060ti', + url: 'https://www.proshop.no/2914081', + }, + { + brand: 'asus', + model: 'strix', + series: '3060ti', + url: 'https://www.proshop.no/2886980', + }, + { + brand: 'asus', + model: 'dual mini oc', + series: '3060ti', + url: 'https://www.proshop.no/2914082', + }, + { + brand: 'zotac', + model: 'twin edge', + series: '3060ti', + url: 'https://www.proshop.no/2914133', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3070', + url: 'https://www.proshop.no/2876871', + }, + { + brand: 'msi', + model: 'suprim', + series: '3070', + url: 'https://www.proshop.no/2908888', + }, + { + brand: 'msi', + model: 'ventus 2x oc', + series: '3070', + url: 'https://www.proshop.no/2876873', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3070', + url: 'https://www.proshop.no/2876875', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3070', + url: 'https://www.proshop.no/2885269', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3070', + url: 'https://www.proshop.no/2876845', + }, + { + brand: 'asus', + model: 'tuf oc', + series: '3070', + url: 'https://www.proshop.no/2876856', + }, + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3070', + url: 'https://www.proshop.no/2878390', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3070', + url: 'https://www.proshop.no/2878383', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3070', + url: 'https://www.proshop.no/2878392', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3070', + url: 'https://www.proshop.no/2878386', + }, + { + brand: 'asus', + model: 'dual oc', + series: '3070', + url: 'https://www.proshop.no/2876853', + }, + { + brand: 'asus', + model: 'dual', + series: '3070', + url: 'https://www.proshop.no/2876851', + }, + { + brand: 'asus', + model: 'tuf', + series: '3070', + url: 'https://www.proshop.no/2876854', + }, + { + brand: 'inno3d', + model: 'twin x2 oc', + series: '3070', + url: 'https://www.proshop.no/2883917', + }, + { + brand: 'asus', + model: 'strix', + series: '3070', + url: 'https://www.proshop.no/2876843', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3070', + url: 'https://www.proshop.no/2878385', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3070', + url: 'https://www.proshop.no/2911575', + }, + { + brand: 'inno3d', + model: 'twin x2', + series: '3070', + url: 'https://www.proshop.no/2883916', + }, + { + brand: 'inno3d', + model: 'ichill x4', + series: '3070', + url: 'https://www.proshop.no/2883919', + }, + { + brand: 'asus', + model: 'strix', + series: '3070', + url: 'https://www.proshop.no/2911574', + }, + { + brand: 'asus', + model: 'ekwb', + series: '3070', + url: 'https://www.proshop.no/2911577', + }, + { + brand: 'inno3d', + model: 'ichill x3', + series: '3070', + url: 'https://www.proshop.no/2883918', + }, + { + brand: 'zotac', + model: 'twin edge', + series: '3070', + url: 'https://www.proshop.no/2911956', + }, + { + brand: 'zotac', + model: 'amp holo', + series: '3070', + url: 'https://www.proshop.no/2912456', + }, + { + brand: 'palit', + model: 'gamerock oc', + series: '3070', + url: 'https://www.proshop.no/2914382', + }, + { + brand: 'palit', + model: 'gamerock oc', + series: '3070', + url: 'https://www.proshop.no/2914381', + }, + { + brand: 'asus', + model: 'strix', + series: '3070', + url: 'https://www.proshop.no/2912910', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3080', + url: 'https://www.proshop.no/2876877', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3080', + url: 'https://www.proshop.no/2885270', + }, + { + brand: 'msi', + model: 'ventus 3x', + series: '3080', + url: 'https://www.proshop.no/2876878', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3080', + url: 'https://www.proshop.no/2876879', + }, + { + brand: 'msi', + model: 'gaming trio', + series: '3080', + url: 'https://www.proshop.no/2876876', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3080', + url: 'https://www.proshop.no/2876859', + }, + { + brand: 'asus', + model: 'tuf', + series: '3080', + url: 'https://www.proshop.no/2876763', + }, + { + brand: 'asus', + model: 'tuf oc', + series: '3080', + url: 'https://www.proshop.no/2876861', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3080', + url: 'https://www.proshop.no/2911579', + }, + { + brand: 'gigabyte', + model: 'gaming oc', + series: '3080', + url: 'https://www.proshop.no/2876838', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3080', + url: 'https://www.proshop.no/2878401', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3080', + url: 'https://www.proshop.no/2876835', + }, + { + brand: 'asus', + model: 'strix', + series: '3080', + url: 'https://www.proshop.no/2876857', + }, + { + brand: 'asus', + model: 'ekwb', + series: '3080', + url: 'https://www.proshop.no/2887568', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3080', + url: 'https://www.proshop.no/2878395', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme', + series: '3080', + url: 'https://www.proshop.no/2876836', + }, + { + brand: 'inno3d', + model: 'ichill x4', + series: '3080', + url: 'https://www.proshop.no/2878971', + }, + { + brand: 'inno3d', + model: 'twin x2 oc', + series: '3080', + url: 'https://www.proshop.no/2878968', + }, + { + brand: 'asus', + model: 'strix', + series: '3080', + url: 'https://www.proshop.no/2911578', + }, + { + brand: 'inno3d', + model: 'ichill x3', + series: '3080', + url: 'https://www.proshop.no/2878969', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3080', + url: 'https://www.proshop.no/2876837', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme waterforce', + series: '3080', + url: 'https://www.proshop.no/2878393', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme waterforce wb', + series: '3080', + url: 'https://www.proshop.no/2878394', + }, + { + brand: 'msi', + model: 'gaming x trio', + series: '3090', + url: 'https://www.proshop.no/2876881', + }, + { + brand: 'msi', + model: 'suprim x', + series: '3090', + url: 'https://www.proshop.no/2885271', + }, + { + brand: 'msi', + model: 'ventus 3x oc', + series: '3090', + url: 'https://www.proshop.no/2876883', + }, + { + brand: 'msi', + model: 'ventus 3x', + series: '3090', + url: 'https://www.proshop.no/2876882', + }, + { + brand: 'asus', + model: 'tuf oc', + series: '3090', + url: 'https://www.proshop.no/2876869', + }, + { + brand: 'msi', + model: 'gaming trio', + series: '3090', + url: 'https://www.proshop.no/2876880', + }, + { + brand: 'inno3d', + model: 'gaming x3', + series: '3090', + url: 'https://www.proshop.no/2878977', + }, + { + brand: 'inno3d', + model: 'ichill x3', + series: '3090', + url: 'https://www.proshop.no/2878978', + }, + { + brand: 'inno3d', + model: 'ichill x4', + series: '3090', + url: 'https://www.proshop.no/2878979', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3090', + url: 'https://www.proshop.no/2876867', + }, + { + brand: 'gigabyte', + model: 'aorus master', + series: '3090', + url: 'https://www.proshop.no/2876840', + }, + { + brand: 'asus', + model: 'tuf', + series: '3090', + url: 'https://www.proshop.no/2876764', + }, + { + brand: 'asus', + model: 'strix oc', + series: '3090', + url: 'https://www.proshop.no/2911582', + }, + { + brand: 'asus', + model: 'ekwb', + series: '3090', + url: 'https://www.proshop.no/2887569', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme', + series: '3090', + url: 'https://www.proshop.no/2876839', + }, + { + brand: 'gigabyte', + model: 'aorus xtreme waterforce', + series: '3090', + url: 'https://www.proshop.no/2878404', + }, + { + brand: 'gigabyte', + model: 'vision oc', + series: '3090', + url: 'https://www.proshop.no/2878413', + }, + { + brand: 'inno3d', + model: 'ichill frostbite', + series: '3090', + url: 'https://www.proshop.no/2887323', + }, + { + brand: 'asus', + model: 'strix', + series: '3090', + url: 'https://www.proshop.no/2878405', + }, + { + brand: 'asus', + model: 'strix', + series: '3090', + url: 'https://www.proshop.no/2911581', + }, + { + brand: 'gigabyte', + model: 'eagle oc', + series: '3090', + url: 'https://www.proshop.no/2876841', + }, + { + brand: 'gigabyte', + model: 'turbo', + series: '3090', + url: 'https://www.proshop.no/2878410', + }, + { + brand: 'gigabyte', + model: 'eagle', + series: '3090', + url: 'https://www.proshop.no/2878406', + }, + { + brand: 'palit', + model: 'gamerock oc', + series: '3090', + url: 'https://www.proshop.no/2911898', + }, + { + brand: 'amd', + model: '5800x', + series: 'ryzen5800', + url: 'https://www.proshop.no/2884171', + }, + { + brand: 'amd', + model: '5900x', + series: 'ryzen5900', + url: 'https://www.proshop.no/2884173', + }, + { + brand: 'amd', + model: '5950x', + series: 'ryzen5950', + url: 'https://www.proshop.no/2884175', + }, + ], + name: 'proshop-no', +}; From 60680e5764e4097888c7e4d98851930a15c643f4 Mon Sep 17 00:00:00 2001 From: David Olsson Date: Wed, 17 Feb 2021 23:03:03 +0100 Subject: [PATCH 2/4] remove maxprice from norwegian stores since it didnt work --- src/store/model/dustinhome-no.ts | 4 ---- src/store/model/elkjop.ts | 4 ---- src/store/model/komplett-no.ts | 4 ---- src/store/model/power-no.ts | 4 ---- src/store/model/proshop-no.ts | 5 ----- 5 files changed, 21 deletions(-) diff --git a/src/store/model/dustinhome-no.ts b/src/store/model/dustinhome-no.ts index 126c015f1e..2ea4a25a10 100644 --- a/src/store/model/dustinhome-no.ts +++ b/src/store/model/dustinhome-no.ts @@ -7,10 +7,6 @@ export const DustinHomeNO: Store = { container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', text: ['Kan sendes omgående'], }, - maxPrice: { - container: - '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.product-pricing.product-page-b-test.ng-star-inserted > div.price-block > div > div > div > span', - }, outOfStock: { container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', text: ['Vi venter produktet til lager, men har foreløpig ingen bekreftet leveringsdato. Vi sender produktet så snart det er på lager.'], diff --git a/src/store/model/elkjop.ts b/src/store/model/elkjop.ts index 6071d04341..56f2ec1b7d 100644 --- a/src/store/model/elkjop.ts +++ b/src/store/model/elkjop.ts @@ -7,10 +7,6 @@ export const Elkjop: Store = { container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', text: ['Legg i handlevogn'], }, - maxPrice: { - container: 'div.product-price-container > span', - euroFormat: false, - }, outOfStock: { container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', text: ['Ikke tilgjengelig'], diff --git a/src/store/model/komplett-no.ts b/src/store/model/komplett-no.ts index 530ea66625..c5ea6b3b48 100644 --- a/src/store/model/komplett-no.ts +++ b/src/store/model/komplett-no.ts @@ -7,10 +7,6 @@ export const KomplettNO: Store = { container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.product-main-info-buy-button > div.buy-button > button', text: ['LEGG I HANDLEVOGN'], }, - maxPrice: { - container: - '.product-price > span[class="product-price-now"]', - }, outOfStock: { container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.subscribe-product-container > div > div > button', text: ['MOTTA VARSEL'], diff --git a/src/store/model/power-no.ts b/src/store/model/power-no.ts index 20af5e3565..43386f6a3d 100644 --- a/src/store/model/power-no.ts +++ b/src/store/model/power-no.ts @@ -7,10 +7,6 @@ export const PowerNO: Store = { container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div.buy-area__webshop > button', text: ['Legg til handlekurv'], }, - maxPrice: { - container: - '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.product-pricing.product-page-b-test.ng-star-inserted > div.price-block > div > div > div > span', - }, outOfStock: { container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div > button', text: ['Ikke på lager'], diff --git a/src/store/model/proshop-no.ts b/src/store/model/proshop-no.ts index c876a7e575..99db09054f 100644 --- a/src/store/model/proshop-no.ts +++ b/src/store/model/proshop-no.ts @@ -7,11 +7,6 @@ export const ProshopNO: Store = { container: '.site-stock', text: ['1-3 dager til levering', 'Fjernlager'], }, - maxPrice: { - container: - '.site-currency-wrapper > span[class="site-currency-attention"]', - euroFormat: true, - }, outOfStock: { container: '.site-stock', text: ['Bestilt'], From 9df7f335e1e3ebd4174bca010a7cc243f0aac718 Mon Sep 17 00:00:00 2001 From: David Olsson Date: Wed, 17 Feb 2021 23:13:13 +0100 Subject: [PATCH 3/4] npm run fix --- src/store/model/dustinhome-no.ts | 10 +++++++--- src/store/model/elkjop.ts | 31 ++++++++++++++++++++----------- src/store/model/komplett-no.ts | 6 ++++-- src/store/model/power-no.ts | 6 ++++-- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/store/model/dustinhome-no.ts b/src/store/model/dustinhome-no.ts index 2ea4a25a10..6c5be2c819 100644 --- a/src/store/model/dustinhome-no.ts +++ b/src/store/model/dustinhome-no.ts @@ -4,12 +4,16 @@ export const DustinHomeNO: Store = { currency: 'kr.', labels: { inStock: { - container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', + container: + 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', text: ['Kan sendes omgående'], }, outOfStock: { - container: 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', - text: ['Vi venter produktet til lager, men har foreløpig ingen bekreftet leveringsdato. Vi sender produktet så snart det er på lager.'], + container: + 'div.c-product-main-info > div.c-product-buy-wrapper > div.u-pt-16.u-relative.d-flex > div > span', + text: [ + 'Vi venter produktet til lager, men har foreløpig ingen bekreftet leveringsdato. Vi sender produktet så snart det er på lager.', + ], }, }, links: [ diff --git a/src/store/model/elkjop.ts b/src/store/model/elkjop.ts index 56f2ec1b7d..ec6f968b9c 100644 --- a/src/store/model/elkjop.ts +++ b/src/store/model/elkjop.ts @@ -4,11 +4,13 @@ export const Elkjop: Store = { currency: 'kr.', labels: { inStock: { - container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', + container: + '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', text: ['Legg i handlevogn'], }, outOfStock: { - container: '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', + container: + '#product-detail-wrapper > div.col.any-5-12.M-2-5.information > div.buy-button-container.align-left.any-1-1.table-btn > div > div > div.product-price-button-wrap > div > div > span > span', text: ['Ikke tilgjengelig'], }, }, @@ -17,13 +19,15 @@ export const Elkjop: Store = { brand: 'test:brand', model: 'test:model', series: 'test:series', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', }, { brand: 'pny', model: 'xlr8 epic x', series: '3090', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/215370/pny-rtx-3090-24gb-xlr8-gaming-epic-x-rgb-3-fan-2-7slot', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/215370/pny-rtx-3090-24gb-xlr8-gaming-epic-x-rgb-3-fan-2-7slot', }, { brand: 'evga', @@ -35,39 +39,44 @@ export const Elkjop: Store = { brand: 'evga', model: 'xc3', series: '3080', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218419/evga-geforce-rtx-3080-xc3', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218419/evga-geforce-rtx-3080-xc3', }, { brand: 'evga', model: 'xc3 black', series: '3080', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/218425/evga-geforce-rtx-3080-xc3-black', }, { brand: 'evga', model: 'ftw3', series: '3080', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/220655/evga-geforce-rtx-3080-ftw3', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/220655/evga-geforce-rtx-3080-ftw3', }, { brand: 'palit', model: 'gaming pro oc', series: '3080', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222470/geforce-rtx-3080-gamingpro-oc', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222470/geforce-rtx-3080-gamingpro-oc', }, { brand: 'gainward', model: 'phoenix gs', series: '3080', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222467/geforce-rtx-3080-phoenix-gs', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/222467/geforce-rtx-3080-phoenix-gs', }, { brand: 'evga', model: 'xc3 ultra', series: '3090', - url: 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/224771/evga-geforce-rtx-3090-xc3-ultra-24gb', + url: + 'https://www.elkjop.no/product/data/pc-komponenter/grafikkort/224771/evga-geforce-rtx-3090-xc3-ultra-24gb', }, - ], name: 'elkjop', }; diff --git a/src/store/model/komplett-no.ts b/src/store/model/komplett-no.ts index c5ea6b3b48..a7e31beadb 100644 --- a/src/store/model/komplett-no.ts +++ b/src/store/model/komplett-no.ts @@ -4,11 +4,13 @@ export const KomplettNO: Store = { currency: 'kr.', labels: { inStock: { - container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.product-main-info-buy-button > div.buy-button > button', + container: + '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.product-main-info-buy-button > div.buy-button > button', text: ['LEGG I HANDLEVOGN'], }, outOfStock: { - container: '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.subscribe-product-container > div > div > button', + container: + '#MainContent > div.no-bs-center.maincontent-container.container.main-body.ignore-gutter-xs.product-page-boxes > div.responsive-content-wrapper > div.product-page > section > div > section > div.product-main-info__body > div.product-main-info__buy-and-more > div.buy-button-section > div > div > div.subscribe-product-container > div > div > button', text: ['MOTTA VARSEL'], }, }, diff --git a/src/store/model/power-no.ts b/src/store/model/power-no.ts index 43386f6a3d..fbe4640bb4 100644 --- a/src/store/model/power-no.ts +++ b/src/store/model/power-no.ts @@ -4,11 +4,13 @@ export const PowerNO: Store = { currency: 'kr.', labels: { inStock: { - container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div.buy-area__webshop > button', + container: + '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div.buy-area__webshop > button', text: ['Legg til handlekurv'], }, outOfStock: { - container: '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div > button', + container: + '#product-intro > div.container.old-product-page.ng-star-inserted > div > div > div.col-md-7 > div > div.product-control > div.buy-area.ng-star-inserted > div > button', text: ['Ikke på lager'], }, }, From a9bf1472926d1f8cbf1d4d80df3eda3a031e0d13 Mon Sep 17 00:00:00 2001 From: David Olsson Date: Thu, 18 Feb 2021 15:18:20 +0100 Subject: [PATCH 4/4] Update filter.md with new stores --- docs/reference/filter.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/reference/filter.md b/docs/reference/filter.md index c75e55e769..c7c54d7565 100644 --- a/docs/reference/filter.md +++ b/docs/reference/filter.md @@ -87,9 +87,11 @@ Used with the `STORES` variable. | Cyberport | DE | `cyberport` | | DComp | AU | `dcomp`| | Drako | IT | `drako` | +| DustinHome | NO | `dustinhome-no` | | EBGames | CA | `ebgames`| | eBuyer | UK | `ebuyer`| | El Corte Inglés | ES | `elcorteingles`| +| Elkjop | NO | `elkjop`| | ePrice | IT | `eprice`| | Euronics | IT | `euronics`| | Euronics | DE | `euronics-de`| @@ -111,6 +113,7 @@ Used with the `STORES` variable. | iGame Computer | AU | `igame-computer`| | John Lewis | UK | `johnlewis`| | Kabum | BR | `kabum`| +| Komplett | NO | `komplett-no`| | Landmark Computers | AU | `landmark-computers`| | Mediamarkt | DE | `mediamarkt`| | Medimax | DE | `medimax`| @@ -137,8 +140,10 @@ Used with the `STORES` variable. | PCKing | DE | `pcking` | | PlayStation | US | `playstation`| | PNY | US | `pny`| +| Power | NO | `power-no`| | Proshop | DE | `proshop-de`| | Proshop | DK | `proshop-dk`| +| Proshop | NO | `proshop-no`| | Rosman | AU | `rosman`| | Rosman-Melb | AU | `rosman-melb`| | Saturn | DE | `saturn`|