@johnnyboy11234/esg-idea-contest 0.2.4 → 0.3.1

package/frontend/src/shared/api/activity.ts

@@ -0,0 +1,20 @@
+/**
+ * Time of the last answered server request (Frontend.md §8.1, OI-22). Any answer except a 401 means
+ * the server saw the session, so the idle clock restarts; the idle-timeout warning reads it.
+ */
+let last = Date.now();
+const listeners = new Set<() => void>();
+
+export const lastActivity = () => last;
+
+export function markActivity(): void {
+  last = Date.now();
+  listeners.forEach((fn) => fn());
+}
+
+export function subscribeActivity(fn: () => void): () => void {
+  listeners.add(fn);
+  return () => {
+    listeners.delete(fn);
+  };
+}

package/frontend/src/shared/api/http.ts

@@ -1,3 +1,4 @@
+import { markActivity } from './activity';
 import { API_BASE, clearCsrfToken, getCsrfToken, refreshCsrfToken } from './csrf';
 import { parseApiError, type ApiError } from './problem';
 
@@ -73,6 +74,7 @@ export async function apiFetch(path: string, init: ApiRequestInit = {}): Promise
     res = await send(await refreshCsrfToken());
   }
 
+  if (res.status !== 401) markActivity();
   if (res.ok) {
     if (write && SESSION_CHANGING.has(path)) clearCsrfToken();
     return res;

package/frontend/src/shared/api/index.ts

@@ -4,3 +4,4 @@ export { apiFetch, setUnauthenticatedHandler } from './http';
 export type { ApiRequestInit } from './http';
 export { clearCsrfToken, getCsrfToken } from './csrf';
 export type { paths, components } from './types.generated';
+export { lastActivity, markActivity, subscribeActivity } from './activity';

package/frontend/src/shared/i18n/locales/en.ts

@@ -57,6 +57,7 @@ export const en = {
     leaderEmpNo: 'Leader employee ID',
   },
   pages: {
+    idle: { title: 'Are you still there?', body: 'You have been inactive for a while. For your security your session will end in about 2 minutes unless you continue.', continue: 'Continue' },
     login: { title: 'Sign in to your account', description: 'Enter your employee ID and password.', noAccount: 'No account yet?', panelTitle: 'ESG Idea Contest', panelBody: 'Register, form a team and submit your Idea.', submitting: 'Signing in…', sessionEnded: 'Your session has ended. Please sign in again.' },
     register: {
       title: 'Create an account',

package/frontend/src/shared/i18n/locales/zh-TW.ts

@@ -54,6 +54,7 @@ export const zhTW: Dictionary = {
     leaderEmpNo: '組長員工編號',
   },
   pages: {
+    idle: { title: '您還在嗎？', body: '您已閒置一段時間。為了安全，若不繼續使用，您的登入將在約 2 分鐘後結束。', continue: '繼續' },
     login: { title: '登入您的帳號', description: '請輸入員工編號與密碼。', noAccount: '還沒有帳號？', panelTitle: 'ESG 創意競賽', panelBody: '註冊、組隊並提交您的創意。', submitting: '登入中…', sessionEnded: '您的登入已結束，請重新登入。' },
     register: {
       title: '建立帳號',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johnnyboy11234/esg-idea-contest",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "description": "ESG Idea Contest registration system: Go backend, React frontend and design documents (source distribution).",
   "license": "MIT",
   "author": "Brian Huang",

package/testdata/expected-filename.json

@@ -0,0 +1,93 @@
+{
+ "description": "Shared by backend (Go) and frontend (TS). Expected slide filename base per PRD 6.8 and the 255 UTF-8 byte rule of PRD 6.2 (length measured with .pptx). Inputs may be NFD; wantBase is always NFC.",
+ "cases": [
+  {
+   "id": "cool-idea-pdf-example",
+   "category": "COOL_IDEA",
+   "org": "BSID",
+   "leaderName": "\u738b\u5c0f\u660e",
+   "leaderEmpNo": "089290",
+   "ideaName": "\u6210\u7acb\u4f9b\u61c9\u5546\u6c38\u7e8c\u5b78\u9662",
+   "wantBase": "I_BSID_\u738b\u5c0f\u660e_089290_\u6210\u7acb\u4f9b\u61c9\u5546\u6c38\u7e8c\u5b78\u9662",
+   "wantBytes": 56,
+   "wantTooLong": false
+  },
+  {
+   "id": "outstanding-impact-example",
+   "category": "OUTSTANDING_IMPACT",
+   "org": "AAID",
+   "leaderName": "\u838a\u80b2\u6210",
+   "leaderEmpNo": "054616",
+   "ideaName": "AI\u79d8\u5bc6\u6b66\u5668\u667a\u80fd\u5c0d\u8a71",
+   "wantBase": "O_AAID_\u838a\u80b2\u6210_054616_AI\u79d8\u5bc6\u6b66\u5668\u667a\u80fd\u5c0d\u8a71",
+   "wantBytes": 55,
+   "wantTooLong": false
+  },
+  {
+   "id": "name-with-inner-space",
+   "category": "COOL_IDEA",
+   "org": "TSID",
+   "leaderName": "Alice Wang",
+   "leaderEmpNo": "000001",
+   "ideaName": "Green Plant 2.0",
+   "wantBase": "I_TSID_Alice Wang_000001_Green Plant 2.0",
+   "wantBytes": 45,
+   "wantTooLong": false
+  },
+  {
+   "id": "idea-name-nfd-becomes-nfc",
+   "category": "COOL_IDEA",
+   "org": "ICSD",
+   "leaderName": "Zoe",
+   "leaderEmpNo": "000002",
+   "ideaName": "Cafe\u0301 \u30ab\u3099",
+   "wantBase": "I_ICSD_Zoe_000002_Caf\u00e9 \u30ac",
+   "wantBytes": 32,
+   "wantTooLong": false
+  },
+  {
+   "id": "leader-name-nfd-becomes-nfc",
+   "category": "OUTSTANDING_IMPACT",
+   "org": "PLED",
+   "leaderName": "Jose\u0301",
+   "leaderEmpNo": "000003",
+   "ideaName": "Reuse",
+   "wantBase": "O_PLED_Jos\u00e9_000003_Reuse",
+   "wantBytes": 30,
+   "wantTooLong": false
+  },
+  {
+   "id": "exactly-255-bytes",
+   "category": "OUTSTANDING_IMPACT",
+   "org": "AAID",
+   "leaderName": "\u838a\u80b2\u6210",
+   "leaderEmpNo": "054616",
+   "ideaName": "\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275abcd",
+   "wantBase": "O_AAID_\u838a\u80b2\u6210_054616_\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275abcd",
+   "wantBytes": 255,
+   "wantTooLong": false
+  },
+  {
+   "id": "256-bytes-too-long",
+   "category": "OUTSTANDING_IMPACT",
+   "org": "AAID",
+   "leaderName": "\u838a\u80b2\u6210",
+   "leaderEmpNo": "054616",
+   "ideaName": "\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275abcde",
+   "wantBase": "O_AAID_\u838a\u80b2\u6210_054616_\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275\u5275abcde",
+   "wantBytes": 256,
+   "wantTooLong": true
+  },
+  {
+   "id": "emoji-four-byte-too-long",
+   "category": "COOL_IDEA",
+   "org": "DEID",
+   "leaderName": "\u738b\u5c0f\u660e",
+   "leaderEmpNo": "089290",
+   "ideaName": "\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00",
+   "wantBase": "I_DEID_\u738b\u5c0f\u660e_089290_\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00\ud83d\ude00",
+   "wantBytes": 269,
+   "wantTooLong": true
+  }
+ ]
+}

package/testdata/password.json

@@ -0,0 +1,425 @@
+{
+ "description": "Shared by backend (Go) and frontend (TS). password and empNo are raw strings; empNo is \"\" when the submitted employee ID is malformed (CONTAINS_EMP_NO is then skipped). wantRules lists every violated rule id in PRD 6.4 table order ([] = valid). Rules not implemented yet (SEQUENCE, COMMON_PASSWORD: B1b-03 and later) have no cases here; those cases are added with their rules, and these inputs avoid triggering them. PRD 6.4.",
+ "cases": [
+  {
+   "id": "valid-typical",
+   "password": "Correct-Horse-1",
+   "empNo": "089290",
+   "wantRules": []
+  },
+  {
+   "id": "valid-min-length-12",
+   "password": "Abcdefgh1!xY",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-max-length-64",
+   "password": "Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-space-is-symbol",
+   "password": "Correct Horse1",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-three-classes-no-symbol",
+   "password": "CorrectHorse12",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-three-classes-no-digit",
+   "password": "Correct-Horse-x",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-three-classes-no-upper",
+   "password": "correct-horse-1",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "valid-three-classes-no-lower",
+   "password": "CORRECT-HORSE-1",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "length-11",
+   "password": "Abcdefgh1!x",
+   "empNo": "",
+   "wantRules": [
+    "LENGTH"
+   ]
+  },
+  {
+   "id": "length-65",
+   "password": "Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!Ab1!x",
+   "empNo": "",
+   "wantRules": [
+    "LENGTH"
+   ]
+  },
+  {
+   "id": "length-empty",
+   "password": "",
+   "empNo": "",
+   "wantRules": [
+    "LENGTH",
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "length-counts-code-points-not-bytes",
+   "password": "Aa1!Aa1!Aa1é",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET"
+   ]
+  },
+  {
+   "id": "charset-non-ascii",
+   "password": "Correct-Horse-1é",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET"
+   ]
+  },
+  {
+   "id": "charset-cjk-only-12",
+   "password": "密碼密碼密碼密碼密碼密碼",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET",
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "charset-tab",
+   "password": "Correct\tHorse-1",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET"
+   ]
+  },
+  {
+   "id": "charset-del",
+   "password": "Correct-Horse-1",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET"
+   ]
+  },
+  {
+   "id": "charset-emoji-counts-as-one-code-point",
+   "password": "Correct-Hor1😀",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET"
+   ]
+  },
+  {
+   "id": "complexity-two-classes-lower-digit",
+   "password": "abcdefghij12",
+   "empNo": "",
+   "wantRules": [
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "complexity-two-classes-lower-symbol",
+   "password": "whatever-goes",
+   "empNo": "",
+   "wantRules": [
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "complexity-two-classes-upper-lower",
+   "password": "CorrectHorseXy",
+   "empNo": "",
+   "wantRules": [
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "complexity-non-ascii-is-no-class",
+   "password": "abcdefghijk1é",
+   "empNo": "",
+   "wantRules": [
+    "CHARSET",
+    "COMPLEXITY"
+   ]
+  },
+  {
+   "id": "repeat-three-lower",
+   "password": "Correct-Hoooorse1",
+   "empNo": "",
+   "wantRules": [
+    "REPEAT"
+   ]
+  },
+  {
+   "id": "repeat-three-digit",
+   "password": "Correct-Horse111",
+   "empNo": "",
+   "wantRules": [
+    "REPEAT"
+   ]
+  },
+  {
+   "id": "repeat-exactly-two-ok",
+   "password": "Correct-Hoorse-11",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "repeat-case-sensitive",
+   "password": "Correct-HoOorse-1",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "repeat-symbols",
+   "password": "Correct-Horse1!!!",
+   "empNo": "",
+   "wantRules": [
+    "REPEAT"
+   ]
+  },
+  {
+   "id": "emp-no-contained",
+   "password": "Correct-089290-Ab",
+   "empNo": "089290",
+   "wantRules": [
+    "CONTAINS_EMP_NO"
+   ]
+  },
+  {
+   "id": "emp-no-contained-at-start",
+   "password": "089290-Correct-Ab",
+   "empNo": "089290",
+   "wantRules": [
+    "CONTAINS_EMP_NO"
+   ]
+  },
+  {
+   "id": "emp-no-skipped-when-malformed",
+   "password": "Correct-089290-Ab",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "emp-no-other-number-ok",
+   "password": "Correct-089291-Ab",
+   "empNo": "089290",
+   "wantRules": []
+  },
+  {
+   "id": "table-order-all-violated",
+   "password": "aaaé",
+   "empNo": "123456",
+   "wantRules": [
+    "LENGTH",
+    "CHARSET",
+    "COMPLEXITY",
+    "REPEAT"
+   ]
+  },
+  {
+   "id": "table-order-with-emp-no",
+   "password": "aaa123456",
+   "empNo": "123456",
+   "wantRules": [
+    "LENGTH",
+    "COMPLEXITY",
+    "KEYBOARD_RUN",
+    "REPEAT",
+    "CONTAINS_EMP_NO"
+   ]
+  },
+  {
+   "id": "table-order-full-set",
+   "password": "aaaaaaaaaaaaé123456",
+   "empNo": "123456",
+   "wantRules": [
+    "CHARSET",
+    "COMPLEXITY",
+    "KEYBOARD_RUN",
+    "REPEAT",
+    "CONTAINS_EMP_NO"
+   ]
+  },
+  {
+   "id": "keyboard-row-digits",
+   "password": "Xk9-1234-Pmzj",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-row-qwer",
+   "password": "Zq-qwer-Mj81",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-row-asdf",
+   "password": "Zq-Asdf-Mj81",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-row-bottom",
+   "password": "Zq-xcvb-Mj81",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-reverse",
+   "password": "Zq-rewq-Mj81",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-reverse-digits",
+   "password": "Zq-4321-Mj8P",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-case-insensitive",
+   "password": "Zq-qWeR-Mj81",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-shifted-symbols",
+   "password": "Zq-!@#$-Mjkp",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-mixed-shift-and-plain",
+   "password": "Zq-1@3$-Mjkp",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-longer-run-reported-once",
+   "password": "Zq-qwertyu-M1",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-run-at-start",
+   "password": "qwerZk-Mj81xP",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-run-at-end",
+   "password": "Zk-Mj81xP-poiu",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-punctuation-row",
+   "password": "Zk-Mj81xP;lkj",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-three-keys-ok",
+   "password": "Zq-qwe-Mj81xP",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-row-end-does-not-wrap-to-next-row",
+   "password": "Zq-90-qw-Mj81",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-rows-do-not-join",
+   "password": "Zq-pasdMj81xP",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-direction-change-ok",
+   "password": "Zq-qwewq-Mj81",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-gap-ok",
+   "password": "Zq-qwdf-Mj81xP",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-non-row-glyph-breaks-run",
+   "password": "Zq-qw~er-Mj81",
+   "empNo": "",
+   "wantRules": []
+  },
+  {
+   "id": "keyboard-repeat-is-not-a-run",
+   "password": "Zq-qqqq-Mj81xP",
+   "empNo": "",
+   "wantRules": [
+    "REPEAT"
+   ]
+  },
+  {
+   "id": "keyboard-and-complexity",
+   "password": "qwertyuiopas",
+   "empNo": "",
+   "wantRules": [
+    "COMPLEXITY",
+    "KEYBOARD_RUN"
+   ]
+  },
+  {
+   "id": "keyboard-before-repeat-in-table-order",
+   "password": "Zq-1234-aaa-Mj",
+   "empNo": "",
+   "wantRules": [
+    "KEYBOARD_RUN",
+    "REPEAT"
+   ]
+  }
+ ]
+}