+
\ No newline at end of file
diff --git a/src/app/shared/module/odk/component/header/header.component.scss b/src/app/shared/module/odk/component/header/header.component.scss
index 859e43b8..d7bca9dd 100644
--- a/src/app/shared/module/odk/component/header/header.component.scss
+++ b/src/app/shared/module/odk/component/header/header.component.scss
@@ -24,10 +24,7 @@ $border-color: #1a1a1a;
}
.header {
- position: fixed;
- z-index: 1000;
- left: 0;
- right: 0;
+ position: relative;
height: $header-size;
line-height: $header-size + 2px;
background: $header-background;
@@ -39,12 +36,19 @@ $border-color: #1a1a1a;
text-align: center;
}
- &:not(.reverse) {
- top: 0;
- }
+ &.fixed {
+ position: fixed;
+ z-index: 1000;
+ left: 0;
+ right: 0;
+
+ &:not(.reverse) {
+ top: 0;
+ }
- &.reverse {
- bottom: 0;
+ &.reverse {
+ bottom: 0;
+ }
}
}
@@ -84,18 +88,22 @@ $border-color: #1a1a1a;
}
.content {
+ width: 100%;
+
&:not(.inline) {
height: calc(100% - 30px);
}
- width: 100%;
- padding: 30px 0 0 0;
+
+ &.fixed {
+ padding: 30px 0 0 0;
+
+ &.reverse {
+ padding: 0 0 30px 0;
+ }
+ }
&.frame {
border: 1px solid $border-color;
border-top: none;
}
-
- &.reverse {
- padding: 0 0 30px 0;
- }
}
diff --git a/src/app/shared/module/odk/component/header/header.component.ts b/src/app/shared/module/odk/component/header/header.component.ts
index ca03c1c7..f66b3cee 100644
--- a/src/app/shared/module/odk/component/header/header.component.ts
+++ b/src/app/shared/module/odk/component/header/header.component.ts
@@ -40,6 +40,9 @@ export class HeaderComponent implements OnInit {
@Input()
public reverse = false;
+ @Input()
+ public fixed = false;
+
@Input()
public frame = true;
diff --git a/src/app/shared/module/poe/trade/fetch/trade-fetch.service.ts b/src/app/shared/module/poe/trade/fetch/trade-fetch.service.ts
index a47052b5..156dc7e6 100644
--- a/src/app/shared/module/poe/trade/fetch/trade-fetch.service.ts
+++ b/src/app/shared/module/poe/trade/fetch/trade-fetch.service.ts
@@ -57,7 +57,9 @@ export class TradeFetchService {
map(responses => responses
.filter(x => x.result?.length)
.reduce
((a, b) => a.concat(b.result), cached)
- .filter(x => x?.id?.length)),
+ .filter(x => x?.id?.length)
+ .sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id))
+ ),
map(results => results.map(result => {
const key = `${CACHE_PREFIX}_${exchange}_${result.id}`;
return this.cache.store(key, result, CACHE_EXPIRY);
diff --git a/src/assets/i18n/english.json b/src/assets/i18n/english.json
index 4ac3be70..b631b889 100644
--- a/src/assets/i18n/english.json
+++ b/src/assets/i18n/english.json
@@ -4,6 +4,10 @@
"message": "Opens a webpage on hotkey press in the in-game browser.\n\nTry the hotkey below to open poe.ninja.",
"title": "Bookmarks"
},
+ "changelog-1-0-5": {
+ "message": "- added support page with discord and github issues\n- added trade filter setting (Incoming & Outgoing, Incoming)\n- added trade layout setting (Top To Bottom, Bottom To Top)\n- added trade window to be transparent if no active trades and the window is pinned\n- update trade action finished to be always shown even if no trade have been initalized\n- fixed a focus issue occuring when using the trade whisper button\n- fixed a sorting issue at the market result list",
+ "title": "What's new in 1.0.5?"
+ },
"commands": {
"message": "All game commands can be bound to hotkeys.\n\nThere are also placeholders like @char available which will be replaced before executing the command.\n\nTry the hotkey below to teleport into your hideout.",
"title": "Commands"
diff --git a/src/assets/i18n/french.json b/src/assets/i18n/french.json
index be2e30cc..777a81ce 100644
--- a/src/assets/i18n/french.json
+++ b/src/assets/i18n/french.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Cliquez sur l'icône en surbrillance pour ouvrir le filtre. Ajustez les valeurs à votre guise.",
- "title": ""
+ "title": "Filtre"
},
"message": "Le marché vous permet de parcourir les articles listés et d'échanger des devises dans le jeu.\n\nPeut être basculé en appuyant sur la touche de raccourci ci-dessous:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "C'est tout pour le moment. J'espère que vous apprécierez mon application.\n\n- Cordialement, Kyusung4698",
- "title": ""
+ "title": "Je vous remercie!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/german.json b/src/assets/i18n/german.json
index 33095215..04b5e1cd 100644
--- a/src/assets/i18n/german.json
+++ b/src/assets/i18n/german.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Klicken Sie auf das hervorgehobene Symbol, um den Filter zu öffnen. Passen Sie die Werte an Ihre Bedürfnisse an.",
- "title": ""
+ "title": "Filter"
},
"message": "Auf dem Markt können Sie aufgelistete Gegenstände durchsuchen und Währungen im Spiel austauschen.\n\nKann durch Drücken des folgenden Hotkeys umgeschaltet werden:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "Das war es fürs Erste. Hoffe dir gefällt meine App.\n\n- Mit freundlichen Grüßen, Kyusung4698",
- "title": ""
+ "title": "Vielen Dank!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/korean.json b/src/assets/i18n/korean.json
index 4a689ec2..48577f7a 100644
--- a/src/assets/i18n/korean.json
+++ b/src/assets/i18n/korean.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "강조 표시된 아이콘을 클릭하여 필터를 엽니 다. 원하는대로 값을 조정하십시오.",
- "title": ""
+ "title": "필터"
},
"message": "시장에서는 게임 내에서 나열된 항목을 찾아보고 통화를 교환 할 수 있습니다.\n\n아래 핫키를 눌러 전환 할 수 있습니다.",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "그게 다야. 내 앱을 즐기시기 바랍니다.\n\n-Kyusung4698 감사합니다",
- "title": ""
+ "title": "고맙습니다!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/polish.json b/src/assets/i18n/polish.json
index f4924a14..cc93d422 100644
--- a/src/assets/i18n/polish.json
+++ b/src/assets/i18n/polish.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Kliknij podświetloną ikonę, aby otworzyć filtr. Dostosuj wartości do swoich potrzeb.",
- "title": ""
+ "title": "filtr"
},
"message": "Rynek pozwala przeglądać wymienione przedmioty i wymieniać waluty w grze.\n\nMożna go przełączać, naciskając poniższy skrót:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "Na razie tyle. Mam nadzieję, że podoba Ci się moja aplikacja.\n\n- Z pozdrowieniami, Kyusung4698",
- "title": ""
+ "title": "Dziękuję Ci!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/portuguese.json b/src/assets/i18n/portuguese.json
index abd7bdec..2cddd11f 100644
--- a/src/assets/i18n/portuguese.json
+++ b/src/assets/i18n/portuguese.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Clique no ícone destacado para abrir o filtro. Ajuste os valores ao seu gosto.",
- "title": ""
+ "title": "Filtro"
},
"message": "O mercado permite que você navegue pelos itens listados e troque moedas dentro do jogo.\n\nPode ser alternado pressionando a tecla de atalho abaixo:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "Por enquanto é isso. Espero que você goste do meu aplicativo.\n\n- Atenciosamente, Kyusung4698",
- "title": ""
+ "title": "Obrigado!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/russian.json b/src/assets/i18n/russian.json
index a0ddfb7f..7608031f 100644
--- a/src/assets/i18n/russian.json
+++ b/src/assets/i18n/russian.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Нажмите на выделенный значок, чтобы открыть фильтр. Отрегулируйте значения по своему вкусу.",
- "title": ""
+ "title": "Фильтр"
},
"message": "Рынок позволяет просматривать перечисленные предметы и обменивать валюты внутри игры.\n\nМожет быть переключено нажатием горячей клавиши ниже:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "Это пока что. Надеюсь, вам понравится мое приложение.\n\n- С наилучшими пожеланиями, Kyusung4698",
- "title": ""
+ "title": "Спасибо!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/simplified-chinese.json b/src/assets/i18n/simplified-chinese.json
index d949dcfd..2f0e2677 100644
--- a/src/assets/i18n/simplified-chinese.json
+++ b/src/assets/i18n/simplified-chinese.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "单击突出显示的图标以打开过滤器。将值调整为您喜欢的值。",
- "title": ""
+ "title": "过滤"
},
"message": "市场允许您浏览列出的项目并在游戏中交换货币。\n\n可以通过按以下热键进行切换:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "现在就这样。希望您喜欢我的应用。\n\n-敬礼,Kyusung4698",
- "title": ""
+ "title": "谢谢!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/spanish.json b/src/assets/i18n/spanish.json
index 98dc9ad9..acf6388d 100644
--- a/src/assets/i18n/spanish.json
+++ b/src/assets/i18n/spanish.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "Haga clic en el icono resaltado para abrir el filtro. Ajusta los valores a tu gusto.",
- "title": ""
+ "title": "Filtrar"
},
"message": "El mercado te permite navegar por los artículos listados e intercambiar monedas dentro del juego.\n\nSe puede activar presionando la tecla de acceso rápido a continuación:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "Eso es todo por ahora. Espero que disfrutes mi aplicación.\n\n- Saludos cordiales, Kyusung4698",
- "title": ""
+ "title": "¡Gracias!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/thai.json b/src/assets/i18n/thai.json
index 0192e527..eec83ef4 100644
--- a/src/assets/i18n/thai.json
+++ b/src/assets/i18n/thai.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "คลิกไอคอนที่ไฮไลต์เพื่อเปิดตัวกรอง ปรับค่าตามที่คุณต้องการ",
- "title": ""
+ "title": "กรอง"
},
"message": "ตลาดช่วยให้คุณสามารถเรียกดูรายการที่ระบุไว้และแลกเปลี่ยนสกุลเงินภายในเกม\n\nสามารถสลับได้โดยกดปุ่มลัดด้านล่าง:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "แค่นี้แหละ หวังว่าคุณจะสนุกกับแอพของฉัน\n\n- ขอแสดงความนับถือ Kyusung4698",
- "title": ""
+ "title": "ขอขอบคุณ!"
},
"trade": {
"highlight": {
diff --git a/src/assets/i18n/traditional-chinese.json b/src/assets/i18n/traditional-chinese.json
index cb5f5eca..efa2340d 100644
--- a/src/assets/i18n/traditional-chinese.json
+++ b/src/assets/i18n/traditional-chinese.json
@@ -68,7 +68,7 @@
},
"filter": {
"message": "單擊突出顯示的圖標以打開過濾器。將值調整為您喜歡的值。",
- "title": ""
+ "title": "過濾"
},
"message": "市場允許您瀏覽列出的項目並在遊戲中交換貨幣。\n\n可以通過按以下熱鍵進行切換:",
"reset": {
@@ -107,7 +107,7 @@
},
"thanks": {
"message": "現在就這樣。希望您喜歡我的應用。\n\n-敬禮,Kyusung4698",
- "title": ""
+ "title": "謝謝!"
},
"trade": {
"highlight": {