Skip to content

Commit a625a84

Browse files
committed
[Editor] design patches
1 parent 4b9360e commit a625a84

File tree

5 files changed

+65
-31
lines changed

5 files changed

+65
-31
lines changed

notes.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,44 +25,44 @@
2525
- [X] Drop shadow for fixations
2626
- [X] Completion handler improvements (soft complete (not all manually done), complete (all manually done))
2727
- [X] Scan path rendering
28-
- [ ] **Good colours** (I believe mostly done)
29-
- [X] ***Clean up options (remove some, add some others)***
28+
- [X] Good colours -> the current config is okay
29+
- [X] *Clean up options (remove some, add some others)
3030
- [X] Colour picker for Color objects
3131
- [X] Moving back all the way with arrows -> arrow right stops working -> JS was dumb (mod of negative number is negative number wtf)
3232
- [X] T1 R552, popeye slice point 2 assigns to multiple?
3333
- [X] Multiple lines showing from annotations
3434
- [X] Cmd-starting commands (cmd + +, etc) should also be a thing
3535
- [X] Trackpad zoom & move
36-
- [X] **Highlighting current fixation (probably add colour change back, or some outline?)**
36+
- [X] Highlighting current fixation (probably add colour change back, or some outline?)
3737
- [X] Highlight box for all algos visualization
3838
- [X] If high agreement, highlight the corresponding box only and user can then (obviously) press space to confirm, else show all options (togglable via setting ofc)
39-
- [ ] **Keybind panel (possible to keep open?)**
40-
- [ ] **Put button to open keybind panel in collapsed sidebar**
41-
- [ ] **Quick guide instead of always visible keybind panel choosable (or none ofc)** -> See below for more details
42-
- [X] **Download annotations button** -> *export to CSV*
39+
- [ ] ~~Keybind panel (possible to keep open?)~~ -> this wouldn't work well, the keybind panel is huge
40+
- [X] Put button to open keybind panel in collapsed sidebar
41+
- [X] Download annotations button -> *export to CSV*
4342
- [X] Invalid fixation keybind -> shift delete or shift backspace
4443
- [X] Fix delete annotation bind (doesn't fully unassign, also requires two backspaces)
4544
- [X] Invalid fixation rendering
46-
- [ ] **Add button to mark fixation as invalid** -> annotations.markFixationAsInvalid is func to be called -> On hover show keybind
45+
- [X] Add button to mark fixation as invalid -> annotations.markFixationAsInvalid is func to be called -> On hover show keybind
4746
- [X] Backspace moves backwards if no annotation present
4847
- [X] Space bar assignment doesn't work (on Mac at least) --> TODO: Verify
4948
- [ ] ~~Optional: Show zoom box if lots of fixations close by~~
5049
- [X] Zoom to fixation
5150
- [X] Move to fixation when moving around (and zoom factor > 1)
5251
- [ ] **Render hovered boxes above everything else (to make it more legible, maybe add condition to this)**
5352

54-
### Quick guide
53+
### ~~Quick guide~~
5554
A short summary for how to use the editor, preferrably graphical, with the most important keybinds on there.
5655
Just an idea from the meeting, doesn't have to happen, but could be a solid idea.
5756
Alternatively add a button to restart the tour somewhere (maybe in the keybinds panel)
5857

59-
58+
-> We already have a welcome panel, the tour & the keybinds panel.
59+
I think adding more user guidance would end up being confusing (i.e. suppose I'm looking for info x, in which of these 4 places do I check for x now?)
6060

6161
## General
6262
- [X] Deployment
6363
- [X] Update theme colours
6464
- [X] Better error handling for backend errors (i.e. better notifications)
65-
- [ ] **RWD fixes (Signup and Login views)**
65+
- [X] RWD fixes (Signup and Login views)
6666
- [X] Block if device is too small (also touch devices don't work!) -> Design?
6767
- [ ] Take care of all TODOs in the code
6868
- [X] Buttons with long actions need spinners or other progress indicator
@@ -73,14 +73,13 @@ Alternatively add a button to restart the tour somewhere (maybe in the keybinds
7373
- [X] "Select All" on Survey-creation doesn't work
7474
- [X] Upload pre-assigned points with multi-file select button on Text creation
7575
- [X] Design
76-
- [ ] Bug testing
7776
- [X] Reload surveys on create
7877
- [X] New Survey options
7978
- [ ] Add parser for char bounding boxes for the uid based format (take inspiration from the annotations one)
8079
- [ ] Upload: Allow multiple files for multiple readers or one file with multiple readers -- TODO: Testing
8180
- [ ] Pre-annotations: One file for each algorithm, filename is the algo name (minus extension).
82-
- [ ] **Define file contents specs somewhere** -> Needs integration & design, see `src/components/admin/FileSpecs.vue`
83-
- [ ] Magic link regen
81+
- [ ] **Define file contents specs somewhere** -> Needs integration & design, see `src/components/admin/FileSpecs.vue` (What is this for?)
82+
- [ ] Optional: Magic link regen
8483
- [X] Magic link panel close warning
8584
- [X] survey delete -- TODO: Testing
8685
- [X] survey export -- TODO: Testing

src/editor/components/SidePane.vue

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,6 @@
118118
>
119119
<i class="fa-xl fa-solid fa-circle-xmark"></i>
120120
</span>
121-
<span
122-
v-if="showExportButton"
123-
class="clickable-icon"
124-
title="Export annotations as CSV"
125-
@click="exportCsv"
126-
>
127-
<i class="fa-xl fa-solid fa-file-csv"></i>
128-
</span>
129121
</div>
130122
<div class="options-bar-right">
131123
<span class="clickable-icon" @click="toggleCollapse()">
@@ -134,11 +126,6 @@
134126
</div>
135127
</div>
136128
<!-- Collapsed -->
137-
<div v-if="isSideBarCollapsed" class="options-bar">
138-
<span class="clickable-icon gear-icon" title="Options" @click="togglePreferences">
139-
<i class="fa-lg fa-solid fa-gear"></i>
140-
</span>
141-
</div>
142129
<div v-if="isSideBarCollapsed" class="options-bar">
143130
<span
144131
class="clickable-icon"
@@ -191,6 +178,20 @@
191178
<i class="fa-xl fa-solid fa-file-csv"></i>
192179
</span>
193180
</div>
181+
<div v-if="isSideBarCollapsed" class="options-bar bottom">
182+
<span
183+
class="clickable-icon"
184+
title="Show keybinds"
185+
@click="toggleKeybinds"
186+
>
187+
<i class="fa-xl fa-solid fa-circle-question"></i>
188+
</span>
189+
</div>
190+
<div v-if="isSideBarCollapsed" class="options-bar">
191+
<span class="clickable-icon gear-icon" title="Options" @click="togglePreferences">
192+
<i class="fa-lg fa-solid fa-gear"></i>
193+
</span>
194+
</div>
194195
<!-- Content -->
195196
<div v-if="!isSideBarCollapsed">
196197
<div id="tour-options" class="options-bar-sm">
@@ -204,6 +205,14 @@
204205
>
205206
<i class="fa-lg fa-regular fa-circle-question"></i>
206207
</span>
208+
<span
209+
v-if="showExportButton"
210+
class="clickable-icon"
211+
title="Export annotations as CSV"
212+
@click="exportCsv"
213+
>
214+
<i class="fa-lg fa-solid fa-file-csv"></i>
215+
</span>
207216
<span
208217
id="tour-preferences"
209218
class="clickable-icon gear-icon"
@@ -237,7 +246,6 @@
237246
width: 400px; // Hardcoded, scalable sidebar (that looks good) is much work
238247
min-width: 400px;
239248
max-width: 22vw;
240-
display: block;
241249
overflow-x: hidden;
242250
transition: width 0.25s, min-width 0.25s;
243251
@@ -294,7 +302,7 @@
294302
display: flex;
295303
align-items: center;
296304
justify-content: space-between;
297-
width: 60px;
305+
width: 90px;
298306
}
299307
300308
.clickable-icon {

src/scss/components/floating-form.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
@include rwd-ratio("square", "standard") {
4949
/* border-color: green; */
5050
width: 55vw;
51-
height: 55vh;
51+
height: 70vh;
5252
}
5353

5454
@include rwd-ratio("standard", "wide") {
5555
/* border-color: lightcoral; */
5656
width: 35vw;
57-
height: 60vh;
57+
height: 70vh;
5858
}
5959

6060
@include rwd-ratio("wide", "ultrawide") {

src/views/StartView.vue

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
justify-content: center;
6868
align-items: center;
6969
flex-direction: row;
70+
overflow: hidden;
7071
7172
>.top-bar {
7273
height: 8vh;
@@ -99,6 +100,10 @@
99100
justify-content: space-between;
100101
width: 25rem;
101102
103+
@media screen and (max-width: 800px) {
104+
margin-left: 1rem;
105+
}
106+
102107
>button {
103108
margin-bottom: 1rem;
104109
width: 12rem;
@@ -112,6 +117,13 @@
112117
justify-content: left;
113118
margin-bottom: 1rem;
114119
120+
@media screen and (max-width: 800px) {
121+
flex-direction: column;
122+
align-items: flex-start;
123+
justify-content: space-between;
124+
height: 6rem;
125+
}
126+
115127
>button {
116128
width: 12rem;
117129
}
@@ -121,11 +133,18 @@
121133
.tagline {
122134
margin-top: 0px;
123135
margin-bottom: 6vh;
136+
137+
@media screen and (max-width: 800px) {
138+
margin-left: 1rem;
139+
}
124140
}
125141
126142
.logo {
127143
height: 15vh;
128144
justify-content: left;
145+
@media screen and (max-width: 800px) {
146+
margin-left: 1rem;
147+
}
129148
}
130149
}
131150

src/views/auth/SignupView.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,15 @@
295295
}
296296
}
297297
298+
.buttons {
299+
margin-top: 1rem;
300+
}
301+
298302
.inputs {
303+
overflow-y: auto;
304+
overflow-x: hidden;
305+
scrollbar-color: var( --theme-bg-4 ) var( --theme-bg-3 );
306+
299307
>.desc {
300308
color: var(--theme-bg-3-20);
301309
font-size: 0.85rem;

0 commit comments

Comments
 (0)