Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SF-2414 Refactor CC answer tabs into a single view #2287

Merged
merged 45 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6da5f9f
Refactored CC answer tabs into a single view
josephmyers Jan 9, 2024
6d1161b
Brought in padding on recording icons
josephmyers Jan 10, 2024
dc4fe5b
Implemented new design for CC answers
josephmyers Jan 15, 2024
3b2bd0a
Improved wording for buttons
josephmyers Jan 15, 2024
bb590a7
Removed focus behavior for audio recorder.
josephmyers Jan 15, 2024
8d3ea7a
Shifted delete button to top right
josephmyers Jan 16, 2024
68a219a
Fixed the scripture ref display for answers
josephmyers Jan 16, 2024
b161af9
Refactored text and audio to a combined component
josephmyers Jan 23, 2024
aeb2531
Lint
josephmyers Jan 23, 2024
ab0c70a
Lint
josephmyers Jan 23, 2024
d8d7bc8
Question dialog uses text/audio component
josephmyers Jan 24, 2024
1017ec2
Affixed the audio X button to the center
josephmyers Jan 24, 2024
484385e
Removed compact capability from the audio recorder
josephmyers Jan 24, 2024
dedb627
Added optional upload to text and audio component
josephmyers Jan 24, 2024
68d8bbe
Tooltips appear before their buttons
josephmyers Jan 25, 2024
43722e4
Record button sticks to the top when resizing textbox
josephmyers Jan 25, 2024
8457a14
All audio variations stick to the top of the textbox
josephmyers Jan 25, 2024
015616d
Audio uniformly deals in AudioAttachment's
josephmyers Jan 30, 2024
4a3d47c
Removed fdescribe
josephmyers Jan 30, 2024
1a1c5a7
Text autofocus only for answers pane
josephmyers Jan 31, 2024
473ce23
Fixed warning in unit test
josephmyers Jan 31, 2024
2860c42
Fixed sizing/spacing of textarea after rebase
josephmyers Jan 31, 2024
c1548ab
Fixed error spacing and borders after rebase
josephmyers Jan 31, 2024
cae0011
Mark textarea as touched when submitting a question
josephmyers Jan 31, 2024
560708b
Increased min textarea height.
josephmyers Jan 31, 2024
32f167a
Some cleanup
josephmyers Jan 31, 2024
5d781bf
PR comments
josephmyers Feb 28, 2024
8542c5c
Few more PR comments
josephmyers Feb 29, 2024
0733143
Fit scripture references on one line if there's room
josephmyers Mar 1, 2024
324ac9b
Replaced my new interfaces with TextAudioValue
josephmyers Mar 5, 2024
d25b7a7
Revert "Replaced my new interfaces with TextAudioValue"
josephmyers Mar 5, 2024
72d71d7
Removed my new interfaces in favor of defining the type inline in the…
josephmyers Mar 6, 2024
39366ed
Fix rebase
josephmyers Apr 15, 2024
84985a5
UI refactor for text and audio.
josephmyers Apr 22, 2024
85e7a1e
Disable upload in Edit Question
josephmyers Apr 22, 2024
27641b1
Added secondary theme to audio player
josephmyers Apr 22, 2024
08655f1
Updates for Edit Question
josephmyers Apr 23, 2024
f4bf59b
PR comments
josephmyers Apr 29, 2024
4d374e7
Revert large-style buttons
josephmyers Apr 30, 2024
1ee7755
Two sets of cancel/save buttons
josephmyers Apr 30, 2024
7d2369d
PR comments
josephmyers May 2, 2024
512c161
PR comments
josephmyers May 6, 2024
739868d
Cleanup
josephmyers May 7, 2024
4f2192f
Fixed up the selected verses display in the answer detail section
josephmyers May 13, 2024
e48fe9a
Fixing a couple tests
josephmyers May 13, 2024
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
1 change: 1 addition & 0 deletions src/RealtimeServer/scriptureforge/models/answer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface Answer extends Comment {
selectionStartClipped?: boolean;
selectionEndClipped?: boolean;
audioUrl?: string;
text?: string;
likes: Like[];
comments: Comment[];
status?: AnswerStatus;
Expand Down
3 changes: 2 additions & 1 deletion src/SIL.XForge.Scripture/ClientApp/src/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ $greenLight: #b8d432;
$greenDark: #5f7333;
$blueMedium: #3b5998;
$orange: #ff7300;
$errorColor: #b00020;
$red: #b00020;

/* App specific */
$sf_grey: $greyDark;
$sf_header: $sf_grey;
$errorColor: $red;
$likes: #578cff;
$questions: $purpleLight;
$answers: $greenLight;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { CheckingRoutingModule } from './checking-routing.module';
import { CheckingAnswersComponent } from './checking/checking-answers/checking-answers.component';
import { CheckingCommentFormComponent } from './checking/checking-answers/checking-comments/checking-comment-form/checking-comment-form.component';
import { CheckingCommentsComponent } from './checking/checking-answers/checking-comments/checking-comments.component';
import { CheckingAudioCombinedComponent } from './checking/checking-audio-combined/checking-audio-combined.component';
import { CheckingAudioPlayerComponent } from './checking/checking-audio-player/checking-audio-player.component';
import { CheckingAudioRecorderComponent } from './checking/checking-audio-recorder/checking-audio-recorder.component';
import { CheckingQuestionsComponent } from './checking/checking-questions/checking-questions.component';
Expand All @@ -26,6 +25,7 @@ import { FontSizeComponent } from './checking/font-size/font-size.component';
import { ImportQuestionsConfirmationDialogComponent } from './import-questions-dialog/import-questions-confirmation-dialog/import-question-confirmation-dialog.component';
import { ImportQuestionsDialogComponent } from './import-questions-dialog/import-questions-dialog.component';
import { QuestionDialogComponent } from './question-dialog/question-dialog.component';
import { TextAndAudioComponent } from './text-and-audio/text-and-audio.component';

@NgModule({
declarations: [
Expand All @@ -34,6 +34,7 @@ import { QuestionDialogComponent } from './question-dialog/question-dialog.compo
CheckingQuestionsComponent,
CheckingTextComponent,
CheckingAnswersComponent,
TextAndAudioComponent,
QuestionDialogComponent,
ImportQuestionsDialogComponent,
ImportQuestionsConfirmationDialogComponent,
Expand All @@ -46,7 +47,6 @@ import { QuestionDialogComponent } from './question-dialog/question-dialog.compo
AudioPlayerComponent,
CheckingScriptureAudioPlayerComponent,
AudioTimePipe,
CheckingAudioCombinedComponent,
TextChooserDialogComponent,
ChapterAudioDialogComponent
],
Expand Down
Loading
Loading