Code

CS169 Spring 2024 Final Changes#320

Code

Merged

cycomachead merged 95 commits intobeautyjoy:mainbeautyjoy/BJC-Teacher-Tracker:mainfrom cs169:maincs169/BJC-Teacher-Tracker:mainCopy head branch name to clipboardMay 15, 2024

+992-92

Commits

Commits on Apr 5, 2024

• generated routes and created a basic preview page for merging

  ArushC

  committed
  d8a0c3d

  Copy full SHA for d8a0c3d

Commits on Apr 6, 2024

• wrote merge function and updated preview frontend accordingly

  ArushC

  committed
  00d4f4b

  Copy full SHA for 00d4f4b

• wrote merge function

  ArushC

  committed
  6c43d8d

  Copy full SHA for 6c43d8d

• added confirm merge button

  ArushC

  committed
  3a161f4

  Copy full SHA for 3a161f4

• fixed bug in merge

  ArushC

  committed
  8b711cc

  Copy full SHA for 8b711cc

Commits on Apr 8, 2024

• change route to merge

  ArushC

  committed
  c47eec2

  Copy full SHA for c47eec2

• add frontend for switch merge order button

  ArushC

  committed
  893688e

  Copy full SHA for 893688e

• add backend for switch merge order button

  ArushC

  committed
  fc830dc

  Copy full SHA for fc830dc

• rubocop fix

  ArushC

  committed
  83d70d1

  Copy full SHA for 83d70d1

• Changed routing and updated backend logic

  razztech

  committed
  741920a

  Copy full SHA for 741920a

• Changed routing and updated backend logic

  razztech

  committed
  ca51eb5

  Copy full SHA for ca51eb5

• Solved merge conflicts

  razztech

  committed
  2d00cfa

  Copy full SHA for 2d00cfa

• Merging doesn't destroy both entries anymore

  razztech

  committed
  7c3dcdf

  Copy full SHA for 7c3dcdf

• Fixed rubocop

  razztech

  committed
  37f7c33

  Copy full SHA for 37f7c33

Commits on Apr 9, 2024

• add teacher ID field that displays on show page to admin only

  ArushC

  committed
  661556c

  Copy full SHA for 661556c

• Merge branch 'teacher-merge-feature' of github.com:cs169/BJC-Teacher-Tracker-App into teacher-merge-feature

  ArushC

  committed
  3c8a7cf

  Copy full SHA for 3c8a7cf

• added epic frontend for deletion warning

  ArushC

  committed
  23587c8

  Copy full SHA for 23587c8

• added merge button and created searchable merge table

  ArushC

  committed
  8f2198c

  Copy full SHA for 8f2198c

• added modal popup, but no way to exit modal

  ArushC

  committed
  67adaf7

  Copy full SHA for 67adaf7

• add css styling for modal

  ArushC

  committed
  2da31ec

  Copy full SHA for 2da31ec

• rubocop fix

  ArushC

  committed
  7128946

  Copy full SHA for 7128946

Commits on Apr 10, 2024

• update comments

  ArushC

  committed
  949dc73

  Copy full SHA for 949dc73

• added test for switch merge order

  ArushC

  committed
  402df22

  Copy full SHA for 402df22

• added merge test

  ArushC

  committed
  457b271

  Copy full SHA for 457b271

• started cucumber test for session count stuff

  ArushC

  committed
  48d1ed7

  Copy full SHA for 48d1ed7

Commits on Apr 11, 2024

• finish merge test

  ArushC

  committed
  6534641

  Copy full SHA for 6534641

• added test for admin being able to access merge page from teacher show page

  ArushC

  committed
  332241e

  Copy full SHA for 332241e

Commits on Apr 12, 2024

• add test to make sure nonadmin cannot access teacher show page

  ArushC

  committed
  1f2b75d

  Copy full SHA for 1f2b75d

• rubocop fix, and last commit message should have said merge page not show page

  ArushC

  committed
  f983447

  Copy full SHA for f983447

• Merge branch 'main' into teacher-merge-feature

  ArushC

  authored
  6c9ce94

  Copy full SHA for 6c9ce94

Commits on Apr 15, 2024

• Merge branch '187216522-international-schools' into 187227068-languages-feature

  ArushC

  committed
  29b2e68

  Copy full SHA for 29b2e68

• Merge branch '187227068-languages-feature' into teacher-merge-feature

  ArushC

  committed
  1b26462

  Copy full SHA for 1b26462

• Merge branch 'main' into teacher-merge-feature

  ArushC

  committed
  3e42b01

  Copy full SHA for 3e42b01

• Merge branch 'teacher-merge-feature' of github.com:cs169/BJC-Teacher-Tracker-App into teacher-merge-feature

  ArushC

  committed
  95c8b82

  Copy full SHA for 95c8b82

• Merge branch 'main' of github.aaakk.us.kg-razztech:cs169/BJC-Teacher-Tracker-App into teacher-merge-feature

  razztech

  committed
  81a9f5a

  Copy full SHA for 81a9f5a

Commits on Apr 16, 2024

• fix merge conflicts

  ArushC

  committed
  1a0b884

  Copy full SHA for 1a0b884

Commits on Apr 17, 2024

• update frontend

  ArushC

  committed
  352b520

  Copy full SHA for 352b520

• fixed cucumber tests

  ArushC

  committed
  a481ceb

  Copy full SHA for a481ceb

• fixed cucumber tests for real this time

  ArushC

  committed
  0ce7da8

  Copy full SHA for 0ce7da8

• remove debugger from production code

  ArushC

  committed
  35856e8

  Copy full SHA for 35856e8

• Merge branch '187384622/new-email-model-pr3' of github.com:cs169/BJC-Teacher-Tracker-App into teacher-merge-feature

  ArushC

  committed
  dab1b54

  Copy full SHA for dab1b54

Commits on Apr 18, 2024

• FINALLY cucumber tests plz work plz plz

  ArushC

  committed
  f23eca4

  Copy full SHA for f23eca4

• I need this to work

  ArushC

  committed
  7fb905a

  Copy full SHA for 7fb905a

Commits on Apr 19, 2024

• add homeschool BJC and dummy school

  ArushC

  committed
  76921c7

  Copy full SHA for 76921c7

• fixed the 'end' bug, which was due to badly indented code

  ArushC

  committed
  04c3b75

  Copy full SHA for 04c3b75

• in progress modification

  ArushC

  committed
  088a3bc

  Copy full SHA for 088a3bc

• hopefully fixed everything now

  ArushC

  committed
  14f2bf3

  Copy full SHA for 14f2bf3

• fixed JS

  ArushC

  committed
  ed7459d

  Copy full SHA for ed7459d

• further JS fix

  ArushC

  committed
  02ed04e

  Copy full SHA for 02ed04e

• realize rails end bug actually WAS a bug

  ArushC

  committed
  cb86ce4

  Copy full SHA for cb86ce4

• rubocop fix

  ArushC

  committed
  07631d2

  Copy full SHA for 07631d2

• installed active_storage

  ArushC

  committed
  0243e0d

  Copy full SHA for 0243e0d

• add upload files to frontend

  ArushC

  committed
  30defdb

  Copy full SHA for 30defdb

• add JS to render upload file only when status is homeschool

  ArushC

  committed
  13dde00

  Copy full SHA for 13dde00

• got homeschool file upload working on backend and looking kind of ok on frontend

  ArushC

  committed
  3877239

  Copy full SHA for 3877239

Commits on Apr 20, 2024

• add rspec testing for school and email template controllers

  JacksonXu33

  committed
  c7b35e5

  Copy full SHA for c7b35e5

• somehow vscode crashed

  JacksonXu33

  committed
  bb099cf

  Copy full SHA for bb099cf

• fix flashes for rendering

  JacksonXu33

  committed
  82df837

  Copy full SHA for 82df837

Commits on Apr 21, 2024

• got file upload feature working

  ArushC

  committed
  e1d9ca6

  Copy full SHA for e1d9ca6

• added frontend styling for adding files

  ArushC

  committed
  417da08

  Copy full SHA for 417da08

• moved css from show.html.erb to stylesheets

  ArushC

  committed
  828a3a9

  Copy full SHA for 828a3a9

• factor teacher display into partial

  ArushC

  committed
  837468e

  Copy full SHA for 837468e

• support for adding MORE files

  ArushC

  committed
  e8653b4

  Copy full SHA for e8653b4

• added uploaded files frontend

  ArushC

  committed
  9eeb816

  Copy full SHA for 9eeb816

• aligned code

  ArushC

  committed
  44777d5

  Copy full SHA for 44777d5

• add some testing for teacher controller

  JacksonXu33

  committed
  816b0d5

  Copy full SHA for 816b0d5

• accidentally added wrong file

  JacksonXu33

  committed
  482e3c8

  Copy full SHA for 482e3c8

Commits on Apr 22, 2024

• fixed merge conflicts wrt main

  ArushC

  committed
  46a8388

  Copy full SHA for 46a8388

• fixed confirm form resubmission error

  ArushC

  committed
  15b71fb

  Copy full SHA for 15b71fb

• made buttons smaller on merge page

  ArushC

  committed
  749e254

  Copy full SHA for 749e254

• make personal email plural

  ArushC

  committed
  867b4bd

  Copy full SHA for 867b4bd

• Merge pull request #51 from cs169/teacher-merge-feature

  Show description for ca6c172
  ArushC

  authored
  ca6c172

  Copy full SHA for ca6c172

• Merge branch 'main' into 187375265/add-testing

  ArushC

  authored
  2b3154b

  Copy full SHA for 2b3154b

• fix tests after main merge

  JacksonXu33

  committed
  32d9c0c

  Copy full SHA for 32d9c0c

• fix nil error

  ArushC

  committed
  9016d22

  Copy full SHA for 9016d22

Commits on Apr 23, 2024

• merged main into homeschool feature

  ArushC

  committed
  79ac3f3

  Copy full SHA for 79ac3f3

• fix rails version issue

  ArushC

  committed
  47085fc

  Copy full SHA for 47085fc

• Merge branch 'main' of github.com:cs169/BJC-Teacher-Tracker-App into teacher-homeschool-feature

  ArushC

  committed
  f095b1a

  Copy full SHA for f095b1a

• uncomment the amazon s3 line

  ArushC

  committed
  9fdec1b

  Copy full SHA for 9fdec1b

• remove dummy home school

  ArushC

  committed
  d0c8acf

  Copy full SHA for d0c8acf

• added visibility tests

  ArushC

  committed
  698c894

  Copy full SHA for 698c894

• added another sad path test

  ArushC

  committed
  5eb5999

  Copy full SHA for 5eb5999

• added file attachment test

  ArushC

  committed
  3af102d

  Copy full SHA for 3af102d

• finished homeschool feature

  ArushC

  committed
  2af33f6

  Copy full SHA for 2af33f6

Commits on Apr 25, 2024

• Merge pull request #55 from cs169/187375265/add-testing

  Show description for 2eb837f
  ArushC

  authored
  2eb837f

  Copy full SHA for 2eb837f

Commits on Apr 26, 2024

• Merge pull request #56 from cs169/teacher-homeschool-feature

  Show description for 204bf60
  ArushC

  authored
  204bf60

  Copy full SHA for 204bf60

Commits on Apr 29, 2024

• Update README.md

  perryzjc

  authored
  2da3423

  Copy full SHA for 2da3423

Commits on Apr 30, 2024

• Merge pull request #59 from cs169/doc/update-readme

  Show description for 5103c00
  ArushC

  authored
  5103c00

  Copy full SHA for 5103c00

• Merge pull request #58 from cs169/187460464/bugfix/tooltip

  Show description for 19dc0d8
  ArushC

  authored
  19dc0d8

  Copy full SHA for 19dc0d8

Commits on May 10, 2024

• merge @beautyjoy / main

  cycomachead

  committed
  4272ddc

  Copy full SHA for 4272ddc

Commits on May 11, 2024

• merge main / PR fixes

  cycomachead

  committed
  716296c

  Copy full SHA for 716296c

• Delete app/helpers/merge_helper.rb

  cycomachead

  authored
  06e01b8

  Copy full SHA for 06e01b8

• Delete app/views/merge/merge.html.erb

  cycomachead

  authored
  6f06cbb

  Copy full SHA for 6f06cbb

• Update config/routes.rb

  cycomachead

  authored
  63d00b5

  Copy full SHA for 63d00b5

• Dont need to re-include activestorage gem

  cycomachead

  committed
  878d3d4

  Copy full SHA for 878d3d4