Skip to content

Commit

Permalink
feat: auction countdown (#718)
Browse files Browse the repository at this point in the history
This PR is based on #695 following the same approach and using the component in a reusable way.

Closes #698
  • Loading branch information
nachomazzara authored and nicosantangelo committed Nov 28, 2018
1 parent 2e7e3e2 commit 6d7cbdf
Show file tree
Hide file tree
Showing 43 changed files with 6,964 additions and 5,974 deletions.
4,643 changes: 2,344 additions & 2,299 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@
"scripts": {
"lint": "./node_modules/eslint/bin/eslint.js .",
"lint:fix": "./node_modules/eslint/bin/eslint.js --fix .",
"test":
"./node_modules/mocha/bin/mocha -r babel-register -r specs/specs_setup.js specs/setup.js src/**/*.spec.js shared/**/*.spec.js",
"watch:test":
"./node_modules/mocha/bin/mocha -r babel-register -r specs/specs_setup.js specs/setup.js src/*.spec.js src/**/*.spec.js --watch",
"test": "./node_modules/mocha/bin/mocha -r babel-register -r specs/specs_setup.js specs/setup.js src/**/*.spec.js shared/**/*.spec.js",
"watch:test": "./node_modules/mocha/bin/mocha -r babel-register -r specs/specs_setup.js specs/setup.js src/*.spec.js src/**/*.spec.js --watch",
"init-db": "./scripts/initDb.js",
"migrate": "./migrations/migrate",
"renew-blockchain-data": "./scripts/renewBlockchainData.js",
"seed": "./scripts/seed.js",
"translate":
"./scripts/translate.js && prettier ./src/Translation/locales/*.json --write",
"translate": "./scripts/translate.js && prettier ./src/Translation/locales/*.json --write",
"tag": "./scripts/tag.js",
"monitor-blockchain": "./monitor/program.js index",
"sanity-check": "./sanity/program.js run",
Expand All @@ -29,7 +26,11 @@
"type": "git",
"url": "https://github.com/decentraland/marketplace.git"
},
"keywords": ["decentraland", "marketplace", "dapp"],
"keywords": [
"decentraland",
"marketplace",
"dapp"
],
"author": "Decentraland",
"license": "ISC",
"dependencies": {
Expand All @@ -47,7 +48,7 @@
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
"decentraland-commons": "^4.0.1",
"decentraland-eth": "^8.3.0",
"decentraland-eth": "^8.4.0",
"eslint": "4.10.0",
"eslint-config-prettier": "^2.6.0",
"eslint-plugin-prettier": "^2.3.1",
Expand Down
31 changes: 28 additions & 3 deletions src/Translation/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,19 @@
"your_estate": "Your estate",
"your_parcel": "Your parcel"
},
"auction": {
"description":
"Participate in the LAND auction on December 10 and buy LAND!",
"title": "Decentraland LAND Auction"
},
"auction_finished": {
"cta": "Go to marketplace",
"description": "Thank you for participating.",
"land_sold": "LAND sold",
"mana_burned": "Mana burned",
"stats_title": "Here are some stats:",
"title": "Auction Finished"
},
"auction_modal": {
"authorization": "Authorization",
"authorization_description":
Expand All @@ -117,11 +130,10 @@
"processing_tx": "Processing Transaction",
"submit": "Proceed",
"terms_and_conditions": "Terms & Conditions",
"title": "Decentraland LAND Auction",
"tx_failed": "Transaction Failed",
"video_tutorial": "Video Tutorial",
"watch_tutorial": "Watch video tutorial",
"welcome": "Welcome to the Decentraland LAND Auction!"
"welcome": "Welcome to the {title}!"
},
"auction_page": {
"available_parcels": "parcels available",
Expand All @@ -145,6 +157,12 @@
"total_price": "Total price",
"video_tutorial": "video tutorial"
},
"auction_splash": {
"already_subscribed": "You are already subscribed",
"cta": "send",
"cta_title": "Enter your mail and we’ll let you know!",
"subscribed": "Subscribed succesfully!"
},
"authorization": {
"allow": "Authorize the {contract_link} to operate {symbol} on your behalf",
"allowed":
Expand Down Expand Up @@ -247,16 +265,23 @@
"continue": "Continue",
"contributions": "Contributions",
"created_at": "Created at {date}",
"day": "day",
"days": "days",
"duration": "Duration",
"edit": "Edit",
"email": "mail@domain.com",
"estate": "Estate",
"estates": "Estates",
"expired_at": "Expired {time}",
"expires_in": "Expires {time}",
"expires_in_more_than_years": "Expires in over {years} years",
"for": "for",
"hours": "hours",
"land": "LAND",
"learn_more": "learn more",
"loading": "Loading",
"marketplace": "Marketplace",
"minutes": "minutes",
"mortgage": "Mortgage",
"mortgages": "Mortgages",
"own_address_warning": "That's your own address!",
Expand All @@ -273,6 +298,7 @@
"retry": "Retry",
"revoke": "Revoke",
"sale": "Sale",
"seconds": "seconds",
"see_less": "See less",
"see_more": "See more",
"service_unavailable": "Service unavailable",
Expand Down Expand Up @@ -320,7 +346,6 @@
"cancel": "Cancel Mortgage",
"claim": "Claim parcel",
"defaulted_in": "Default",
"duration": "Duration",
"duration_placeholder": "Duration in days",
"errors": {
"amount_minimum": "Amount should be greater than {amount}",
Expand Down
29 changes: 27 additions & 2 deletions src/Translation/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,19 @@
"your_estate": "Su propiedad",
"your_parcel": "Tu parcela"
},
"auction": {
"description":
"¡Participe en la subasta de LAND el 10 de diciembre y compre LAND!",
"title": "Subasta Decentraland LAND"
},
"auction_finished": {
"cta": "Ir al mercado",
"description": "Gracias por participar.",
"land_sold": "LAND vendido",
"mana_burned": "Mana quemada",
"stats_title": "Aquí hay algunas estadísticas:",
"title": "Subasta terminada"
},
"auction_modal": {
"authorization": "Autorización",
"authorization_description":
Expand All @@ -118,7 +131,6 @@
"processing_tx": "Procesando Transacción",
"submit": "Proceder",
"terms_and_conditions": "Términos y Condiciones",
"title": "Decentraland Subasta",
"tx_failed": "Transacción fallida",
"video_tutorial": "Video Tutorial",
"watch_tutorial": "Ver video tutorial",
Expand Down Expand Up @@ -147,6 +159,12 @@
"total_price": "Precio total",
"video_tutorial": "video tutorial"
},
"auction_splash": {
"already_subscribed": "Usted ya está suscrito",
"cta": "enviar",
"cta_title": "¡Ingresa tu correo y te avisaremos!",
"subscribed": "¡Suscrito con éxito!"
},
"authorization": {
"allow": "Autorice al {contract_link} a operar {symbol} en su nombre",
"allowed":
Expand Down Expand Up @@ -248,16 +266,23 @@
"continue": "Continuar",
"contributions": "Contribuciones",
"created_at": "Creado en {date}",
"day": "día",
"days": "dias",
"duration": "Duración",
"edit": "Editar",
"email": "mail@domain.com",
"estate": "Propiedad",
"estates": "Propiedades",
"expired_at": "Caducado {time}",
"expires_in": "Caduca {time}",
"expires_in_more_than_years": "Caduca en más de {years} años",
"for": "para",
"hours": "horas",
"land": "LAND",
"learn_more": "aprende más",
"loading": "Cargando",
"marketplace": "Mercado",
"minutes": "minutos",
"mortgage": "Hipoteca",
"mortgages": "Hipotecas",
"own_address_warning": "Esa es tu propia dirección!",
Expand All @@ -274,6 +299,7 @@
"retry": "Reintentar",
"revoke": "Revocar",
"sale": "Venta",
"seconds": "segundos",
"see_less": "Ver menos",
"see_more": "Ver más",
"service_unavailable": "Servicio no disponible",
Expand Down Expand Up @@ -321,7 +347,6 @@
"cancel": "Cancelar hipoteca",
"claim": "Reclamo de paquete",
"defaulted_in": "Default",
"duration": "Duración",
"duration_placeholder": "Duración en días",
"errors": {
"amount_minimum": "La cantidad debe ser mayor que {amount}",
Expand Down
29 changes: 27 additions & 2 deletions src/Translation/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,19 @@
"your_estate": "Votre domaine",
"your_parcel": "Votre parcelle"
},
"auction": {
"description":
"Participez à la vente aux enchères LAND le 10 décembre et achetez LAND!",
"title": "Decentraland LAND Enchère"
},
"auction_finished": {
"cta": "Aller au marché",
"description": "Merci d'avoir participé.",
"land_sold": "LAND vendu",
"mana_burned": "Mana brûlé",
"stats_title": "Voici quelques statistiques:",
"title": "Enchère terminée"
},
"auction_modal": {
"authorization": "Autorisation",
"authorization_description":
Expand All @@ -120,7 +133,6 @@
"processing_tx": "Traitement de la transaction",
"submit": "Procéder",
"terms_and_conditions": "Termes et conditions",
"title": "Decentraland Enchère",
"tx_failed": "La transaction a échoué",
"video_tutorial": "Didacticiel vidéo",
"watch_tutorial": "Regarder le tutoriel vidéo",
Expand Down Expand Up @@ -150,6 +162,12 @@
"total_price": "Prix ​​total",
"video_tutorial": "didacticiel vidéo"
},
"auction_splash": {
"already_subscribed": "Vous êtes déjà abonné",
"cta": "envoyer",
"cta_title": "Entrez votre courrier et nous vous le ferons savoir!",
"subscribed": "Abonné avec succès!"
},
"authorization": {
"allow": "Autoriser le {contract_link} à utiliser {symbol} en votre nom",
"allowed":
Expand Down Expand Up @@ -254,16 +272,23 @@
"continue": "Continuer",
"contributions": "Contributions",
"created_at": "Créé le {date}",
"day": "journée",
"days": "journées",
"duration": "Durée",
"edit": "Modifier",
"email": "mail@domaine.com",
"estate": "Domaine",
"estates": "Domaines",
"expired_at": "Expiré {time}",
"expires_in": "Expire {time}",
"expires_in_more_than_years": "Expire dans plus de {years} ans",
"for": "pour",
"hours": "heures",
"land": "LAND",
"learn_more": "apprendre encore plus",
"loading": "Chargement",
"marketplace": "Marché",
"minutes": "minutes",
"mortgage": "Hypothèque",
"mortgages": "Hypothèques",
"own_address_warning": "C'est ta propre adresse!",
Expand All @@ -280,6 +305,7 @@
"retry": "Recommencez",
"revoke": "Révoquer",
"sale": "Vente",
"seconds": "secondes",
"see_less": "Voir moins",
"see_more": "Voir plus",
"service_unavailable": "Service indisponible",
Expand Down Expand Up @@ -328,7 +354,6 @@
"cancel": "Annuler l'hypothèque",
"claim": "Demande de parcelle",
"defaulted_in": "Défaut",
"duration": "Durée",
"duration_placeholder": "Durée en jours",
"errors": {
"amount_minimum": "Le montant doit être supérieur à {amount}",
Expand Down
34 changes: 28 additions & 6 deletions src/Translation/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@
"price": "価格",
"price_placeholder": "この{asset_name}の価格はMANAです",
"set_asset_price": "{asset_name}の価格と有効期限を設定します",
"set_new_asset_price":
"{asset_name}の新しい価格または有効期限を設定します",
"set_new_asset_price": "{asset_name}の新しい価格または有効期限を設定します",
"update_asset": "{asset_name}の公開物件を更新する"
},
"atlas": {
Expand All @@ -100,6 +99,18 @@
"your_estate": "あなたのエステート",
"your_parcel": "あなたの区画"
},
"auction": {
"description": "12月10日にLANDオークションに参加し、LANDを購入!",
"title": "Decentraland LANDオークション"
},
"auction_finished": {
"cta": "マーケットプレイスに行く",
"description": "ご参加いただきありがとうございます。",
"land_sold": "売り上げLAND",
"mana_burned": "マナは燃やされた",
"stats_title": "ここにいくつかの統計があります:",
"title": "オークション終了"
},
"auction_modal": {
"authorization": "承認",
"authorization_description":
Expand All @@ -115,7 +126,6 @@
"processing_tx": "取引の処理",
"submit": "続行する",
"terms_and_conditions": "利用規約",
"title": "Decentraland LANDオークション",
"tx_failed": "処理に失敗しました",
"video_tutorial": "ビデオチュートリアル",
"watch_tutorial": "ビデオチュートリアルを見る",
Expand All @@ -142,6 +152,12 @@
"total_price": "合計金額",
"video_tutorial": "ビデオチュートリアル"
},
"auction_splash": {
"already_subscribed": "あなたはすでに加入しています",
"cta": "送信する",
"cta_title": "あなたのメールを入力し、私たちに知らせてください!",
"subscribed": "うまく購読しました!"
},
"authorization": {
"allow": "{contract_link}に準じて{symbol}を操作することを許可する",
"allowed": "{contract_link}に準じて{symbol}を操作することを許可しました",
Expand Down Expand Up @@ -241,16 +257,23 @@
"continue": "続ける",
"contributions": "貢献区",
"created_at": "{date}に作成済み",
"day": "",
"days": "日々",
"duration": "期間",
"edit": "編集",
"email": "mail@domain.com",
"estate": "エステート",
"estates": "エステート",
"expired_at": "{time}に締切済み",
"expires_in": "締切:{time}",
"expires_in_more_than_years": "締切まであと{years}年以上",
"for": "for",
"hours": "時間",
"land": "LAND",
"learn_more": "もっと詳しく知る",
"loading": "読込み中",
"marketplace": "マーケット",
"minutes": "",
"mortgage": "ローン",
"mortgages": "ローン",
"own_address_warning": "これはあなた自身のアドレスです!",
Expand All @@ -267,6 +290,7 @@
"retry": "やり直す",
"revoke": "取り消す",
"sale": "販売",
"seconds": "",
"see_less": "もっと見る",
"see_more": "続きを見る",
"service_unavailable": "サービスは利用できません",
Expand Down Expand Up @@ -314,7 +338,6 @@
"cancel": "ローンをキャンセルする",
"claim": "区画を請求する",
"defaulted_in": "デフォルト",
"duration": "有効期間",
"duration_placeholder": "有効期限日数",
"errors": {
"amount_minimum": "{amount}より大きい必要があります。",
Expand Down Expand Up @@ -424,8 +447,7 @@
"sign_in": {
"account_unlocked": "アカウントがアンロックされているか確認してください",
"get_started": "始める",
"intro":
"まず始めにあなたのLAND(土地)を安全に保管する環境を整えてください",
"intro": "まず始めにあなたのLAND(土地)を安全に保管する環境を整えてください",
"options": {
"desktop":
"{metamask_link}の拡張機能や{ledger_nano_link}などのハードウェアウォレットを使用できます",
Expand Down
Loading

0 comments on commit 6d7cbdf

Please sign in to comment.