Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
b836ae5
feat: refactor ollama app to separate out ollama api calls into a sep…
klown Mar 28, 2025
8bf9fb4
feat: move `ollamaApi.ts` to `src/client` for use by adpative-palette
klown Mar 28, 2025
2fc8ec1
feat: add types for the typescript version of the ollama api
klown Apr 1, 2025
4369d09
Merge branch 'feat/standard-bliss-board' into feat/integrate-ollama-a…
klown Apr 1, 2025
a118ce6
feat: first attempt at component for activating sentence completion
klown Apr 1, 2025
c1e2ddc
feat: add dynamic sentence completions palette
klown Apr 4, 2025
63058c7
feat: actually commit the `SentenceCompletionsPalette` component
klown Apr 7, 2025
aa726b8
feat: add dialog for changing the system prompt for querying ollama
klown Apr 7, 2025
2faf0f0
feat: improve dialog for system prompt and add dialog for svg string …
klown Apr 9, 2025
94fb28f
fix: insure that `stream` constant is actually a boolean
klown Apr 9, 2025
a30918c
feat: properly update the prompt dialog when a new prompt is added
klown Apr 11, 2025
fb33aa3
feat: move styles of dialogs to their own .scss files
klown Apr 11, 2025
b670284
feat: add some unit tests for the new prompt dialog
klown Apr 14, 2025
14227d4
chore: use constants for form control ids and values
klown Apr 14, 2025
fc50c27
fix: indent typo
klown Apr 15, 2025
ef019df
feat: add tests for `ActionSvgEntryField` component
klown Apr 15, 2025
1e6ac7f
feat: add a way to follow the typing restrictions of ollama.ts when t…
klown Apr 15, 2025
64be8a7
feat: add tests for ollama api
klown Apr 16, 2025
3c66ff4
feat: add dialog to search gloss for symbols and present as a palette
klown Apr 24, 2025
3243ad6
feat: correct markup and styles for `ActionGlossSearchCell` and displ…
klown Apr 28, 2025
f16a927
chore: move `ActionGlossSearchCell` style to an `.scss` file
klown Apr 28, 2025
dbadfbd
fix: convert compostion to a string cleanly
klown Apr 28, 2025
b37f1d7
feat: add search by single BCI AV ID
klown May 9, 2025
e599112
fix: lint error
klown May 9, 2025
79f310e
fix: check for array type in `findCompositionsUsingId()`
klown May 9, 2025
a3e1c5b
feat: add tests for `findCompositionsUsingId()`
klown May 9, 2025
e0b7d2d
Merge branch 'feat/standard-bliss-board' into feat/integrate-ollama-a…
klown Jun 4, 2025
57e8760
Merge branch 'feat/integrate-ollama-api-with-palette' into feat/find-…
klown Jun 5, 2025
13a766a
fix: add `ActionGlossSearchCell` styles file
klown Jun 20, 2025
07d5318
Merge branch 'main' into feat/integrate-ollama-api-with-palette
klown Jun 24, 2025
dcf05f3
Merge branch 'feat/integrate-ollama-api-with-palette' into feat/find-…
klown Jun 24, 2025
4e7d1d0
Merge branch 'main' into feat/integrate-ollama-api-with-palette
klown Jun 26, 2025
26bd92d
Merge branch 'feat/integrate-ollama-api-with-palette' into feat/find-…
klown Jun 26, 2025
301f0b8
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 9, 2025
a5053d8
fix: adjust more casses of `ActionXxx` cells regarding modifier info…
klown Jul 9, 2025
024c0c9
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 9, 2025
81ac43b
feat: provide basic modifier information for other `ActionBmwXxx` cells
klown Jul 9, 2025
bdebc35
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 14, 2025
acb638a
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 16, 2025
5da9ade
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 18, 2025
83a5819
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 18, 2025
bea9fe3
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Jul 21, 2025
f9119f4
feat: add cursor in the bliss symbol input field
klown Aug 5, 2025
ced0db0
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Aug 5, 2025
32765a0
feat: combine `changeEncodingContents` and `cursorPositionSignal` int…
klown Aug 6, 2025
6445da6
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Aug 6, 2025
d5141d0
feat: update based on changes to `changeEncodingContents` signal stru…
klown Aug 13, 2025
49da588
feat: edit symbol at the caret
klown Aug 13, 2025
d9c1cff
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Aug 13, 2025
0a3db26
feat: edit symbol at the caret, part II: add/remove/replace modifiers.
klown Aug 13, 2025
5895bc1
fix: lint errors
klown Aug 15, 2025
d7f0019
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 3, 2025
fefca2a
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 5, 2025
df872ec
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 8, 2025
711a3ef
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 11, 2025
657db8b
fix: adjust since auto-detection of modifiers no longer supported
klown Sep 11, 2025
abdbbe0
fix: stop searching after finding the first occurrence of the given b…
klown Sep 15, 2025
b51d194
Merge branch 'feat/find-by-gloss' into feat/find-by-gloss-plus-modifiers
klown Sep 15, 2025
302fa7d
Merge branch 'main' into feat/find-by-gloss
klown Sep 22, 2025
7bdec42
Merge branch 'feat/find-by-gloss' into feat/find-by-gloss-plus-modifiers
klown Sep 22, 2025
ce8a444
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 22, 2025
6f573ce
Merge branch 'main' into feat/find-by-gloss
klown Sep 25, 2025
ff8b73d
Merge branch 'main' into feat/find-by-gloss-plus-modifiers
klown Sep 25, 2025
3928cd7
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 26, 2025
a09d0ed
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 26, 2025
c54419a
Merge branch 'feat/cursor' into feat/modifiers
klown Sep 26, 2025
1fdd371
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Sep 26, 2025
73fd8bd
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 26, 2025
0cad6de
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Sep 29, 2025
f6ea5c3
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Oct 6, 2025
751372d
Merge branch 'main' into feat/integrate-ollama-api-with-palette
klown Oct 7, 2025
ac981d7
fix: improve contrast of text on sentence completion buttons
klown Oct 7, 2025
3d33073
Merge branch 'feat/integrate-ollama-api-with-palette' into feat/find-…
klown Oct 7, 2025
964871a
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Oct 10, 2025
8c1cdda
feat: prepare demo for ISAAC conference
klown Oct 14, 2025
a7be56a
fix: fix comments and tweak the layout of the main page for the ISAAC…
klown Oct 16, 2025
63b4d85
feat: use compromise module for maodifying gloss when adding inidcators
klown Oct 16, 2025
ea6e526
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Oct 16, 2025
bf58272
Merge branch 'feat/modifiers' into feat/find-by-gloss-plus-modifiers
klown Oct 17, 2025
6daac03
feat: improve use of compromise for modifying gloss when adding inidc…
klown Oct 27, 2025
985edd8
feat: change speech output of "Back" button to just a click sound
klown Oct 27, 2025
f61f308
fix: adjust one test temporarily so it works with compromise module
klown Oct 27, 2025
c2719dc
feat: show/hide of "svg entry" and "search gloss" dialogs
klown Oct 27, 2025
a5de60a
Merge branch 'feat/cursor' into feat/find-by-gloss-plus-modifiers
klown Nov 3, 2025
e5a3682
feat: show "main" bci-av id when searching for all symbols that conta…
klown Nov 5, 2025
c82bd1d
fix: make palette of gloss search results four columns wide
klown Nov 5, 2025
1e9a61e
feat: change symbols and gloss for "remove modifier" button to "remov…
klown Dec 3, 2025
620e542
Merge branch 'feat/find-by-gloss-plus-modifiers' into feat/find-by-gl…
klown Dec 17, 2025
fa28dee
feat: remove code and data erroneously copied from the ISAAC demo branch
klown Jan 12, 2026
4219675
feat: add more unit tests re: gloss search components
klown Jan 16, 2026
44d2ad5
feat: remove hiding of svg entry and search dialogs
klown Jan 16, 2026
69ecee5
feat: remove compromise package from package.json
klown Jan 16, 2026
538e198
fix: actually add the unit test files
klown Jan 16, 2026
7e02130
Merge branch 'main' into feat/find-by-gloss-CLONE
klown Jan 18, 2026
ac89212
feat: clear search text entry field when "clear" button is clicked
klown Jan 18, 2026
c0816a4
feat: remove use of compromise and nlp processing of glosses
klown Feb 2, 2026
44faee5
fix: restore version of `apps/ollama/ollama.js`
klown Feb 6, 2026
123b1e5
feat: address review comments
klown Feb 6, 2026
07cbdb1
feat: fix column calculation for the display of the gloss search resu…
klown Feb 6, 2026
30b6f91
feat; remove button click sound and restore speaking the go-back button
klown Feb 6, 2026
402e4f6
feat: use `malformed` state in `ActionSvgEntryField`to report invalid…
klown Feb 6, 2026
48a70f1
feat: modify styles to partially support dark-based colour schemes.
klown Feb 9, 2026
19d6a05
fix: miscalcuation of the number of columns in the search results pal…
klown Feb 9, 2026
e494c4a
feat: improve name and placeholder text for search vocabulary entry f…
klown Feb 9, 2026
48a1d78
fix: disable dark mode
jobara Feb 10, 2026
6068ac7
Merge pull request #2 from jobara/fix/contrast
klown Feb 12, 2026
11968bd
feat: add `role="status"` to two dialog messages
klown Feb 17, 2026
507ff7d
fix: update copyright dates of changed files to 2026
klown Feb 17, 2026
eea9d90
Merge branch 'main' into feat/find-by-gloss-CLONE
klown Feb 17, 2026
8735016
feat: improve labels and static text for dialogs and search results
klown Feb 18, 2026
56baad4
feat: put symbol itself as the first result when searching by ID
klown Feb 18, 2026
04bab7e
fix: update copyright date
klown Feb 23, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/ollama/ollama.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024 Inclusive Design Research Centre, OCAD University
* Copyright 2024-2026 Inclusive Design Research Centre, OCAD University
* All rights reserved.
*
* Licensed under the New BSD license. You may not use this file except in
Expand Down
41 changes: 34 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,48 @@
<title>Adaptive Palette</title>
</head>
<body>
<!--
Two main ares of the app. This top area is for the UI that supports
1. Entering symbols using SVG builder strings
2. Searching the BCI AV for symbols, displaying the search results
as a palette
-->

<!--
First main aria: Forms for entering SVG builder strings, and for searching
the BCI AV.
-->
<div>
<details id="SvgEntryDialog" style="margin-left: 0.5em;">
<summary>SVG Builder String</summary>
<div id="svgBuilderStringEntry" style="display:inline-grid;"></div>
</details>
</div>
<div id="SearchGlossDialog">
<div id="searchGloss" style="display:inline-grid;"></div>
<div id="searchGlossResults"></div>
</div>

<!--
Second main ares: This is for the Bliss symobl input and palette part
of the app
-->
<div id="inputArea">
<div id="input_palette"></div>
</div>
<div class="oneRow">
<div id="backup_palette"></div>
<div>
<div id="indicators"></div>
</div>
<div>
<div id="modifiers"></div>
</div>
<div>&nbsp;</div>
<div id="mainPaletteDisplayArea">
<script type="module">
import "./src/client/index.js";
</script>
<div class="oneRow">
<div id="backup_palette"></div>
<div id="mainPaletteDisplayArea">
<script type="module">
import "./src/client/index.js";
</script>
</div>
</div>
</body>
</html>
Loading