diff --git a/pb/demo.proto b/pb/demo.proto index e5981af58d8..969392863ee 100644 --- a/pb/demo.proto +++ b/pb/demo.proto @@ -79,7 +79,7 @@ message Product { string picture = 4; Money price_usd = 5; - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. repeated string categories = 6; } diff --git a/src/adservice/src/main/java/hipstershop/AdService.java b/src/adservice/src/main/java/hipstershop/AdService.java index 3d925e630df..3710dd5a171 100644 --- a/src/adservice/src/main/java/hipstershop/AdService.java +++ b/src/adservice/src/main/java/hipstershop/AdService.java @@ -171,47 +171,48 @@ private void blockUntilShutdown() throws InterruptedException { } private static ImmutableListMultimap createAdsMap() { - Ad camera = + Ad hairdryer = Ad.newBuilder() .setRedirectUrl("/product/2ZYFJ3GM2N") - .setText("Film camera for sale. 50% off.") + .setText("Hairdryer for sale. 50% off.") .build(); - Ad lens = + Ad tankTop = Ad.newBuilder() .setRedirectUrl("/product/66VCHSJNUP") - .setText("Vintage camera lens for sale. 20% off.") + .setText("Tank top for sale. 20% off.") .build(); - Ad recordPlayer = + Ad candleHolder = Ad.newBuilder() .setRedirectUrl("/product/0PUK6V6EV0") - .setText("Vintage record player for sale. 30% off.") + .setText("Candle holder for sale. 30% off.") .build(); - Ad bike = + Ad bambooGlassJar = Ad.newBuilder() .setRedirectUrl("/product/9SIQT8TOJO") - .setText("City Bike for sale. 10% off.") + .setText("Bamboo glass jar for sale. 10% off.") .build(); - Ad baristaKit = + Ad watch = Ad.newBuilder() .setRedirectUrl("/product/1YMWWN1N4O") - .setText("Home Barista kitchen kit for sale. Buy one, get second kit for free") + .setText("Watch for sale. Buy one, get second kit for free") .build(); - Ad airPlant = + Ad mug = Ad.newBuilder() .setRedirectUrl("/product/6E92ZMYYFZ") - .setText("Air plants for sale. Buy two, get third one for free") + .setText("Mug for sale. Buy two, get third one for free") .build(); - Ad terrarium = + Ad loafers = Ad.newBuilder() .setRedirectUrl("/product/L9ECAV7KIM") - .setText("Terrarium for sale. Buy one, get second one for free") + .setText("Loafers for sale. Buy one, get second one for free") .build(); return ImmutableListMultimap.builder() - .putAll("photography", camera, lens) - .putAll("vintage", camera, lens, recordPlayer) - .put("cycling", bike) - .put("cookware", baristaKit) - .putAll("gardening", airPlant, terrarium) + .putAll("clothing", tankTop) + .putAll("accessories", watch) + .putAll("footwear", loafers) + .putAll("hair", hairdryer) + .putAll("decor", candleHolder) + .putAll("kitchen", bambooGlassJar, mug) .build(); } diff --git a/src/adservice/src/main/proto/demo.proto b/src/adservice/src/main/proto/demo.proto index e5981af58d8..969392863ee 100644 --- a/src/adservice/src/main/proto/demo.proto +++ b/src/adservice/src/main/proto/demo.proto @@ -79,7 +79,7 @@ message Product { string picture = 4; Money price_usd = 5; - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. repeated string categories = 6; } diff --git a/src/checkoutservice/genproto/demo.pb.go b/src/checkoutservice/genproto/demo.pb.go index 838624d01e7..05ee3ab78a7 100644 --- a/src/checkoutservice/genproto/demo.pb.go +++ b/src/checkoutservice/genproto/demo.pb.go @@ -381,7 +381,7 @@ type Product struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` Picture string `protobuf:"bytes,4,opt,name=picture,proto3" json:"picture,omitempty"` PriceUsd *Money `protobuf:"bytes,5,opt,name=price_usd,json=priceUsd,proto3" json:"price_usd,omitempty"` - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. Categories []string `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` diff --git a/src/currencyservice/proto/demo.proto b/src/currencyservice/proto/demo.proto index e5981af58d8..969392863ee 100644 --- a/src/currencyservice/proto/demo.proto +++ b/src/currencyservice/proto/demo.proto @@ -79,7 +79,7 @@ message Product { string picture = 4; Money price_usd = 5; - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. repeated string categories = 6; } diff --git a/src/frontend/genproto/demo.pb.go b/src/frontend/genproto/demo.pb.go index 838624d01e7..05ee3ab78a7 100644 --- a/src/frontend/genproto/demo.pb.go +++ b/src/frontend/genproto/demo.pb.go @@ -381,7 +381,7 @@ type Product struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` Picture string `protobuf:"bytes,4,opt,name=picture,proto3" json:"picture,omitempty"` PriceUsd *Money `protobuf:"bytes,5,opt,name=price_usd,json=priceUsd,proto3" json:"price_usd,omitempty"` - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. Categories []string `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` diff --git a/src/frontend/static/img/products/air-plant.jpg b/src/frontend/static/img/products/air-plant.jpg deleted file mode 100644 index c43063eec66..00000000000 Binary files a/src/frontend/static/img/products/air-plant.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/bamboo-glass-jar.jpg b/src/frontend/static/img/products/bamboo-glass-jar.jpg new file mode 100644 index 00000000000..a897f19e1d5 Binary files /dev/null and b/src/frontend/static/img/products/bamboo-glass-jar.jpg differ diff --git a/src/frontend/static/img/products/barista-kit.jpg b/src/frontend/static/img/products/barista-kit.jpg deleted file mode 100644 index b7b6a4c9098..00000000000 Binary files a/src/frontend/static/img/products/barista-kit.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/camera-lens.jpg b/src/frontend/static/img/products/camera-lens.jpg deleted file mode 100644 index ba866931720..00000000000 Binary files a/src/frontend/static/img/products/camera-lens.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/camp-mug.jpg b/src/frontend/static/img/products/camp-mug.jpg deleted file mode 100644 index 53c21073874..00000000000 Binary files a/src/frontend/static/img/products/camp-mug.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/candle-holder.jpg b/src/frontend/static/img/products/candle-holder.jpg new file mode 100644 index 00000000000..e3e2789c02e Binary files /dev/null and b/src/frontend/static/img/products/candle-holder.jpg differ diff --git a/src/frontend/static/img/products/city-bike.jpg b/src/frontend/static/img/products/city-bike.jpg deleted file mode 100644 index b11fa1f9c39..00000000000 Binary files a/src/frontend/static/img/products/city-bike.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/credits.txt b/src/frontend/static/img/products/credits.txt deleted file mode 100644 index bb488c4c5fe..00000000000 --- a/src/frontend/static/img/products/credits.txt +++ /dev/null @@ -1,9 +0,0 @@ -film-camera.jpg,CC0 Public Domain,https://pxhere.com/en/photo/829555 -camera-lens.jpg,CC0 Public Domain,https://pxhere.com/en/photo/670041 -air-plant.jpg,,https://unsplash.com/photos/uUwEAW5jFLE -camp-mug.jpg,,https://unsplash.com/photos/h9VhRlMfVkg -record-player.jpg,,https://unsplash.com/photos/pEEHFSX1vak -city-bike.jpg,,https://unsplash.com/photos/Lpe9u9etwMU -typewriter.jpg,,https://unsplash.com/photos/mk7D-4UCfmg -barista-kit.jpg,,https://unsplash.com/photos/ZiRyGGIpRCw -terrarium.jpg,,https://unsplash.com/photos/E9QYLj0724Y diff --git a/src/frontend/static/img/products/film-camera.jpg b/src/frontend/static/img/products/film-camera.jpg deleted file mode 100644 index 6f9549fe36b..00000000000 Binary files a/src/frontend/static/img/products/film-camera.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/hairdryer.jpg b/src/frontend/static/img/products/hairdryer.jpg new file mode 100644 index 00000000000..5b4db418952 Binary files /dev/null and b/src/frontend/static/img/products/hairdryer.jpg differ diff --git a/src/frontend/static/img/products/loafers.jpg b/src/frontend/static/img/products/loafers.jpg new file mode 100644 index 00000000000..f14c1966cf6 Binary files /dev/null and b/src/frontend/static/img/products/loafers.jpg differ diff --git a/src/frontend/static/img/products/mug.jpg b/src/frontend/static/img/products/mug.jpg new file mode 100644 index 00000000000..36420367fe6 Binary files /dev/null and b/src/frontend/static/img/products/mug.jpg differ diff --git a/src/frontend/static/img/products/record-player.jpg b/src/frontend/static/img/products/record-player.jpg deleted file mode 100644 index f7319d34700..00000000000 Binary files a/src/frontend/static/img/products/record-player.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/salt-and-pepper-shakers.jpg b/src/frontend/static/img/products/salt-and-pepper-shakers.jpg new file mode 100644 index 00000000000..b81264e8c59 Binary files /dev/null and b/src/frontend/static/img/products/salt-and-pepper-shakers.jpg differ diff --git a/src/frontend/static/img/products/sunglasses.jpg b/src/frontend/static/img/products/sunglasses.jpg new file mode 100644 index 00000000000..f31b153f6c4 Binary files /dev/null and b/src/frontend/static/img/products/sunglasses.jpg differ diff --git a/src/frontend/static/img/products/tank-top.jpg b/src/frontend/static/img/products/tank-top.jpg new file mode 100644 index 00000000000..2e3baa09516 Binary files /dev/null and b/src/frontend/static/img/products/tank-top.jpg differ diff --git a/src/frontend/static/img/products/terrarium.jpg b/src/frontend/static/img/products/terrarium.jpg deleted file mode 100644 index dbfaee040ac..00000000000 Binary files a/src/frontend/static/img/products/terrarium.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/typewriter.jpg b/src/frontend/static/img/products/typewriter.jpg deleted file mode 100644 index 22e9ff2ea96..00000000000 Binary files a/src/frontend/static/img/products/typewriter.jpg and /dev/null differ diff --git a/src/frontend/static/img/products/watch.jpg b/src/frontend/static/img/products/watch.jpg new file mode 100644 index 00000000000..71f0c11a520 Binary files /dev/null and b/src/frontend/static/img/products/watch.jpg differ diff --git a/src/paymentservice/proto/demo.proto b/src/paymentservice/proto/demo.proto index e5981af58d8..969392863ee 100644 --- a/src/paymentservice/proto/demo.proto +++ b/src/paymentservice/proto/demo.proto @@ -79,7 +79,7 @@ message Product { string picture = 4; Money price_usd = 5; - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. repeated string categories = 6; } diff --git a/src/productcatalogservice/genproto/demo.pb.go b/src/productcatalogservice/genproto/demo.pb.go index 838624d01e7..05ee3ab78a7 100644 --- a/src/productcatalogservice/genproto/demo.pb.go +++ b/src/productcatalogservice/genproto/demo.pb.go @@ -381,7 +381,7 @@ type Product struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` Picture string `protobuf:"bytes,4,opt,name=picture,proto3" json:"picture,omitempty"` PriceUsd *Money `protobuf:"bytes,5,opt,name=price_usd,json=priceUsd,proto3" json:"price_usd,omitempty"` - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. Categories []string `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` diff --git a/src/productcatalogservice/products.json b/src/productcatalogservice/products.json index 6fd239df60e..d5dd59194de 100644 --- a/src/productcatalogservice/products.json +++ b/src/productcatalogservice/products.json @@ -2,109 +2,111 @@ "products": [ { "id": "OLJCESPC7Z", - "name": "Vintage Typewriter", - "description": "This typewriter looks good in your living room.", - "picture": "/static/img/products/typewriter.jpg", + "name": "Sunglasses", + "description": "Add a modern touch to your outfits with these sleek aviator sunglasses.", + "picture": "/static/img/products/sunglasses.jpg", "priceUsd": { "currencyCode": "USD", - "units": 67, + "units": 19, "nanos": 990000000 }, - "categories": ["vintage"] + "categories": ["accessories"] }, { "id": "66VCHSJNUP", - "name": "Antique Camera", - "description": "It probably doesn't work anyway.", - "picture": "/static/img/products/camera-lens.jpg", + "name": "Tank Top", + "description": "Perfectly cropped cotton tank, with a scooped neckline.", + "picture": "/static/img/products/tank-top.jpg", "priceUsd": { "currencyCode": "USD", - "units": 12, - "nanos": 490000000 + "units": 18, + "nanos": 990000000 }, - "categories": ["photography", "vintage"] + "categories": ["clothing", "tops"] }, { "id": "1YMWWN1N4O", - "name": "Home Barista Kit", - "description": "Always wanted to brew coffee with Chemex and Aeropress at home?", - "picture": "/static/img/products/barista-kit.jpg", + "name": "Watch", + "description": "This gold-tone stainless steel watch will work with most of your outfits.", + "picture": "/static/img/products/watch.jpg", "priceUsd": { "currencyCode": "USD", - "units": 124 + "units": 109, + "nanos": 990000000 }, - "categories": ["cookware"] + "categories": ["accessories"] }, { "id": "L9ECAV7KIM", - "name": "Terrarium", - "description": "This terrarium will looks great in your white painted living room.", - "picture": "/static/img/products/terrarium.jpg", + "name": "Loafers", + "description": "A neat addition to your summer wardrobe.", + "picture": "/static/img/products/loafers.jpg", "priceUsd": { "currencyCode": "USD", - "units": 36, - "nanos": 450000000 + "units": 89, + "nanos": 990000000 }, - "categories": ["gardening"] + "categories": ["footwear"] }, { "id": "2ZYFJ3GM2N", - "name": "Film Camera", - "description": "This camera looks like it's a film camera, but it's actually digital.", - "picture": "/static/img/products/film-camera.jpg", + "name": "Hairdryer", + "description": "This lightweight hairdryer has 3 heat and speed settings. It's perfect for travel.", + "picture": "/static/img/products/hairdryer.jpg", "priceUsd": { "currencyCode": "USD", - "units": 2245 + "units": 24, + "nanos": 990000000 }, - "categories": ["photography", "vintage"] + "categories": ["hair", "beauty"] }, { "id": "0PUK6V6EV0", - "name": "Vintage Record Player", - "description": "It still works.", - "picture": "/static/img/products/record-player.jpg", + "name": "Candle Holder", + "description": "This small but intricate candle holder is an excellent gift.", + "picture": "/static/img/products/candle-holder.jpg", "priceUsd": { "currencyCode": "USD", - "units": 65, - "nanos": 500000000 + "units": 18, + "nanos": 990000000 }, - "categories": ["music", "vintage"] + "categories": ["decor", "home"] }, { "id": "LS4PSXUNUM", - "name": "Metal Camping Mug", - "description": "You probably don't go camping that often but this is better than plastic cups.", - "picture": "/static/img/products/camp-mug.jpg", + "name": "Salt & Pepper Shakers", + "description": "Add some flavor to your kitchen.", + "picture": "/static/img/products/salt-and-pepper-shakers.jpg", "priceUsd": { "currencyCode": "USD", - "units": 24, - "nanos": 330000000 + "units": 18, + "nanos": 490000000 }, - "categories": ["cookware"] + "categories": ["kitchen"] }, { "id": "9SIQT8TOJO", - "name": "City Bike", - "description": "This single gear bike probably cannot climb the hills of San Francisco.", - "picture": "/static/img/products/city-bike.jpg", + "name": "Bamboo Glass Jar", + "description": "This bamboo glass jar can hold 57 oz (1.7 l) and is perfect for any kitchen.", + "picture": "/static/img/products/bamboo-glass-jar.jpg", "priceUsd": { "currencyCode": "USD", - "units": 789, - "nanos": 500000000 + "units": 5, + "nanos": 490000000 }, - "categories": ["cycling"] + "categories": ["kitchen"] }, { "id": "6E92ZMYYFZ", - "name": "Air Plant", - "description": "Have you ever wondered whether air plants need water? Buy one and figure out.", - "picture": "/static/img/products/air-plant.jpg", + "name": "Mug", + "description": "A simple mug with a mustard interior.", + "picture": "/static/img/products/mug.jpg", "priceUsd": { "currencyCode": "USD", - "units": 12, - "nanos": 300000000 + "units": 8, + "nanos": 990000000 }, - "categories": ["gardening"] + "categories": ["kitchen"] } ] } diff --git a/src/productcatalogservice/server_test.go b/src/productcatalogservice/server_test.go index b2d7a41c820..fbf6afaf9d9 100644 --- a/src/productcatalogservice/server_test.go +++ b/src/productcatalogservice/server_test.go @@ -58,7 +58,7 @@ func TestServer(t *testing.T) { t.Errorf("got %s, want %s", got, want) } - sres, err := client.SearchProducts(ctx, &pb.SearchProductsRequest{Query: "typewriter"}) + sres, err := client.SearchProducts(ctx, &pb.SearchProductsRequest{Query: "sunglasses"}) if err != nil { t.Fatal(err) } diff --git a/src/shippingservice/genproto/demo.pb.go b/src/shippingservice/genproto/demo.pb.go index 838624d01e7..05ee3ab78a7 100644 --- a/src/shippingservice/genproto/demo.pb.go +++ b/src/shippingservice/genproto/demo.pb.go @@ -381,7 +381,7 @@ type Product struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` Picture string `protobuf:"bytes,4,opt,name=picture,proto3" json:"picture,omitempty"` PriceUsd *Money `protobuf:"bytes,5,opt,name=price_usd,json=priceUsd,proto3" json:"price_usd,omitempty"` - // Categories such as "vintage" or "gardening" that can be used to look up + // Categories such as "clothing" or "kitchen" that can be used to look up // other related products. Categories []string `protobuf:"bytes,6,rep,name=categories,proto3" json:"categories,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"`