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

Iteration 1-3 #12

Merged
merged 191 commits into from
Feb 10, 2025
Merged
Changes from 1 commit
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
ffe0847
feat: initialize repo (#1)
Connor-Bernard Feb 15, 2024
d9b08ae
Set CI workflow by creating main.yml
cynthia-lixinyi Feb 15, 2024
a17a8fc
feat: integrate Bootstrap for UI enhancements
Zzz212zzZ Feb 15, 2024
4bee37f
Add CodeClimate maintainability and test coverage badges to README.md…
cynthia-lixinyi Feb 15, 2024
5494d8f
feat: Integrate LMS API wrapper for Canvas interaction
Zzz212zzZ Feb 16, 2024
4f54d66
feat: Add BCourses controller and view for course listing (/bcourses)
Zzz212zzZ Feb 16, 2024
cb18cb1
feat: Securely store BCourse Dev API Token using Rails credentials
Zzz212zzZ Feb 16, 2024
f0faef0
Update main.yml
cynthia-lixinyi Feb 16, 2024
392eaa6
Update main.yml
cynthia-lixinyi Feb 16, 2024
e9ac650
Update main.yml
cynthia-lixinyi Feb 16, 2024
34e4710
Merge pull request #4 from cs169/#187042202-add-bootstrap
cynthia-lixinyi Feb 17, 2024
9bd2705
fix: Set up CI
Zzz212zzZ Feb 17, 2024
5bf24a8
Merge pull request #6 from cs169/#187042228-set-up-ci
cynthia-lixinyi Feb 17, 2024
39ae894
Chore: removed actioncable and mailer
Feb 18, 2024
eca7c34
Revert "Chore: removed actioncable and mailer"
Feb 18, 2024
e1609e9
Chore: turned off action mailer
Feb 18, 2024
53f0c36
Merge pull request #7 from cs169/187042210-turn-off-mailer
cynthia-lixinyi Feb 18, 2024
9af4181
Merge pull request #3 from cs169/#187042219-add-badges
Sep26 Feb 18, 2024
4ee789e
chore: add pr template
Connor-Bernard Feb 20, 2024
6239213
Merge pull request #8 from cs169/187031513-pr-template
Connor-Bernard Feb 20, 2024
46e28b8
feat!: configure app to use pg in all environments
Connor-Bernard Feb 20, 2024
a1ef43c
chore: make standing up with env through overmind easy
Connor-Bernard Feb 20, 2024
e169d51
docs: add documentation for standing up server with pg to README
Connor-Bernard Feb 20, 2024
cc817a6
docs: specify docs
Connor-Bernard Feb 20, 2024
1631127
chore: remove the authentication model and the helper file since they…
Zzz212zzZ Feb 20, 2024
681af7c
test: add test to the controller
Zzz212zzZ Feb 20, 2024
2034c1a
Remove unnecessary gem and conflict one
Zzz212zzZ Feb 20, 2024
d4fda76
Merge pull request #9 from cs169/187042246-dev-pg-config
cynthia-lixinyi Feb 20, 2024
5577afb
chore: remove overmind binary
Connor-Bernard Feb 20, 2024
5999463
docs: update docs to reflect removed binary
Connor-Bernard Feb 20, 2024
2d1f2d0
Merge pull request #10 from cs169/187042246-remove-overmind-bin
cynthia-lixinyi Feb 20, 2024
801abcd
test refactor: bcourses_controller_spec test
Zzz212zzZ Feb 21, 2024
7d3b404
pull latest main branch, resolve conflict
Zzz212zzZ Feb 21, 2024
9c0bd35
Delete: Mailer/
Zzz212zzZ Feb 22, 2024
cba01be
ci: configure PG
Connor-Bernard Feb 22, 2024
c69dd93
Merge pull request #12 from cs169/187093755-PG-On-Test
Zzz212zzZ Feb 23, 2024
e7f87f7
Merge branch 'main' of https://github.com/cs169/flextensions into #18…
Zzz212zzZ Feb 23, 2024
5a6537a
fix: remove mailers directory causing error (#15)
Connor-Bernard Feb 26, 2024
9c6c1fa
[FEAT] Configure Postgres on Prod (#13)
Connor-Bernard Feb 26, 2024
a7d4316
[CI] Set Up and Migrate DB in CI Tests (#16)
Connor-Bernard Feb 26, 2024
e4c8ea5
[FEAT] Structure API (#14)
Connor-Bernard Feb 26, 2024
df7464e
fix: explicitly cast port to string for env variable (#17)
Connor-Bernard Feb 26, 2024
77705b0
Pull the latest commit (CI test database) to pass CI
Zzz212zzZ Feb 26, 2024
9eb2e2b
chore: add base controllers for api and v1
Connor-Bernard Feb 27, 2024
14027ee
refactor: use module scoping for ping controller
Connor-Bernard Feb 27, 2024
d8d6e13
Merge pull request #18 from cs169/187119286-namespace-base-controllers
cynthia-lixinyi Feb 27, 2024
98d9c6d
feat: Add swagger endpoint to v1
Connor-Bernard Feb 27, 2024
181a286
refactor: clean up ping controller
Connor-Bernard Feb 27, 2024
5894904
chore: remove unused storage.yml entries
Connor-Bernard Feb 27, 2024
59ab5d7
Revert "chore: remove unused storage.yml entries"
Connor-Bernard Feb 27, 2024
e2deef7
Merge pull request #19 from cs169/187101150-swagger-api-endpoint
cynthia-lixinyi Feb 27, 2024
20471a3
Merge branch 'main' into #187042260-configure-canvas-wrapper
Zzz212zzZ Feb 29, 2024
569acd8
Pull latest main, address conflict in Gemfile
Zzz212zzZ Mar 1, 2024
500022a
resolve conflict
Zzz212zzZ Mar 1, 2024
e7ea9a9
Add specific errors to be caught
Zzz212zzZ Mar 2, 2024
606a3b3
Make the url dynamic, instead of hardcoded, only in Prod Env is 'bcou…
Zzz212zzZ Mar 3, 2024
b00ffbe
ci: initial workflow
Connor-Bernard Mar 4, 2024
f5b3a97
fix: use v5 editor for oapi3.x spec
Connor-Bernard Mar 5, 2024
e8edbc4
feat: add ignore error file
Connor-Bernard Mar 5, 2024
7af8fee
fix: change shouldIgnoreError to es5 standard from es6
Connor-Bernard Mar 5, 2024
f6e403a
ci: refined scope of swagger ignored error
Connor-Bernard Mar 5, 2024
e1baddf
fix: relax scope of swagger ignored error
Connor-Bernard Mar 5, 2024
aaeb544
fix: don't worry about exact error
Connor-Bernard Mar 5, 2024
82d9471
fix: ignore error message
Connor-Bernard Mar 5, 2024
4083d3c
wip: figure out error syntax
Connor-Bernard Mar 5, 2024
4e7a5ec
wip: use switch statement
Connor-Bernard Mar 5, 2024
0a789d4
fix: cast error location to string
Connor-Bernard Mar 5, 2024
77f0134
wip: stop using switch statement
Connor-Bernard Mar 5, 2024
c5a520d
wip: catch all for testing
Connor-Bernard Mar 5, 2024
954c0d4
wip: swaped back to test from location
Connor-Bernard Mar 5, 2024
85c4448
wip: add more log statements
Connor-Bernard Mar 5, 2024
bd60b35
wip: just openapi
Connor-Bernard Mar 5, 2024
b4440f4
wip: !!
Connor-Bernard Mar 5, 2024
ceeada3
wip: "error at openapi"
Connor-Bernard Mar 5, 2024
956dbe2
wip: "Structural.*openapi"
Connor-Bernard Mar 5, 2024
1663731
wip: "Structural\serror.*openapi"
Connor-Bernard Mar 5, 2024
f1613f6
wip: "Structural\ error.*openapi"
Connor-Bernard Mar 5, 2024
dc8b8ca
fix: escape all spaces
Connor-Bernard Mar 5, 2024
347ddbf
wip: "Structural\ error\ at\.*openapi"
Connor-Bernard Mar 5, 2024
291f15c
wip: try and find what is going on
Connor-Bernard Mar 5, 2024
47c19aa
wip: don't obj destructure array
Connor-Bernard Mar 5, 2024
64fcfed
wip: loosen match
Connor-Bernard Mar 5, 2024
4c6a173
wip: only escape one space?
Connor-Bernard Mar 5, 2024
834c5fa
wip: look into first space
Connor-Bernard Mar 5, 2024
4679cd4
wip: look into second space
Connor-Bernard Mar 5, 2024
b19e67d
wip: isolate issue with first space
Connor-Bernard Mar 5, 2024
14d2b5a
wip: yep the first space is goofy
Connor-Bernard Mar 5, 2024
4ac9100
docs: add comment about weird behavior
Connor-Bernard Mar 5, 2024
d808ec6
Merge pull request #20 from cs169/187101148-swagger-validation-cicd
cynthia-lixinyi Mar 5, 2024
0365183
Refactor Credentials: update how bcourses controller get credentials …
Zzz212zzZ Mar 5, 2024
0b16e03
Refactor credential structure, modify url/api_key name
Zzz212zzZ Mar 5, 2024
ce10edd
Remove redundant byebug
Zzz212zzZ Mar 5, 2024
8c617fb
Merge pull request #5 from cs169/#187042260-configure-canvas-wrapper
Zzz212zzZ Mar 6, 2024
8200fc1
CI: add validation to main (#21)
Connor-Bernard Mar 11, 2024
e59ca79
create users table
cynthia-lixinyi Mar 14, 2024
16934be
Created and migrated all tables: users, courses, usertocourses, platf…
cynthia-lixinyi Mar 14, 2024
526e381
feat: assignment api endpoint structuring
Zzz212zzZ Mar 15, 2024
29bb5ab
docs: add swagger docs for 3 assignments api routes
Zzz212zzZ Mar 15, 2024
0fc8fdf
Fix: swagger data type doesn't have a bigint, so replaced with string
Zzz212zzZ Mar 15, 2024
e714bd1
[FEAT] Structure Courses Controller (#22)
Connor-Bernard Mar 19, 2024
509c6d2
Update app/assets/swagger/swagger.json
Zzz212zzZ Mar 20, 2024
be6cbdd
Resolve pulled conflict
Zzz212zzZ Mar 21, 2024
41be01b
Change the table name from platformcredentials to platform_credentials
cynthia-lixinyi Mar 22, 2024
698d90e
Change the table name from usertocourses to user_to_courses
cynthia-lixinyi Mar 22, 2024
6d4e796
Rename 20240314225751_create_usertocourses.rb to 20240314225751_creat…
cynthia-lixinyi Mar 22, 2024
e69c71c
Update and rename 20240314225935_create_coursetoplatforms.rb to 20240…
cynthia-lixinyi Mar 22, 2024
b324231
Change the table name from coursetoplatforms to course_to_platforms
cynthia-lixinyi Mar 22, 2024
2c5f2b9
Change the field name from assignment_name to name
cynthia-lixinyi Mar 22, 2024
846bfae
Change naming according to convention
cynthia-lixinyi Mar 22, 2024
2ea6ee0
Enforce uniqueness on email in users table
cynthia-lixinyi Mar 22, 2024
fc80e6e
Enforce uniqueness on email in users table
cynthia-lixinyi Mar 22, 2024
b84da65
Make last_procedded_by to be foreign keys referring to users
cynthia-lixinyi Mar 22, 2024
f747212
Make last_procedded_by to be foreign keys referring to users; sucessf…
cynthia-lixinyi Mar 22, 2024
def1675
Changed the naming: platform -> lms
cynthia-lixinyi Mar 26, 2024
cbaf43f
Rename 20240314225845_create_platforms.rb to 20240314225845_create_lm…
cynthia-lixinyi Mar 26, 2024
4568e09
Naming: changed platforms to lmss
cynthia-lixinyi Mar 26, 2024
9c2f400
Naming: changed platforms to lmss
cynthia-lixinyi Mar 26, 2024
5c32842
Change name: platform -> lms
Zzz212zzZ Mar 28, 2024
ce317fc
[FEAT] Structure LMS Controller (#26)
Connor-Bernard Apr 1, 2024
071a96b
Chore: Remove the `puts`, which was for test before
Zzz212zzZ Apr 1, 2024
1eb234a
basic extensions structuring (pending local tests)
ekandell Apr 2, 2024
d89e64a
fixing typos/extra ends
ekandell Apr 2, 2024
3fba435
Fix the route: under the courses and lmss
Zzz212zzZ Apr 4, 2024
8b34480
Merge lmss
Zzz212zzZ Apr 4, 2024
c527246
Fix assignment controller test
Zzz212zzZ Apr 4, 2024
cdf92e8
Merge branch 'main' into 187205159-structure-assignments-controller
Zzz212zzZ Apr 4, 2024
c18e47d
Resolve the duplicate swagger.json
Zzz212zzZ Apr 4, 2024
62b1753
almost done w extensions structuring
ekandell Apr 5, 2024
3e3b6a8
finised extensions controller
zee6197 Apr 5, 2024
0d482e2
Updated the swagger UI
zee6197 Apr 5, 2024
9d3ac3e
fixed error in swagger schema
zee6197 Apr 5, 2024
f9fd4e5
Merge branch '187205159-structure-assignments-controller' of github.c…
Connor-Bernard Apr 5, 2024
c614d89
FEAT: Structure users controller
Apr 5, 2024
de620bc
added the missing end at the end
Apr 5, 2024
4422b38
fixed ordering of index and destroy
Apr 5, 2024
94f3184
change name from user_controllers to users_controller
Apr 5, 2024
58e8f51
Merge pull request #29 from cs169/187205141-structure-users-controller
Sep26 Apr 9, 2024
37fc145
Merge branch 'main' into 187205179-initial-data-migration
cynthia-lixinyi Apr 10, 2024
13e2a75
Add refresh_token to lms_credentials table
cynthia-lixinyi Apr 10, 2024
e048578
trivial change in indentation
cynthia-lixinyi Apr 10, 2024
6292471
Merge pull request #23 from cs169/187205179-initial-data-migration
armandofox Apr 11, 2024
31f54c9
Merge pull request #28 from cs169/187205160-structure-extensions-cont…
armandofox Apr 11, 2024
689b2fd
typos fixed
ekandell Apr 11, 2024
9845d50
Resolve conflict
Zzz212zzZ Apr 11, 2024
e87d0d0
Merge branch '187205159-structure-assignments-controller' of https://…
Zzz212zzZ Apr 11, 2024
69ae97d
missed a couple
ekandell Apr 11, 2024
d5e635f
Merge pull request #24 from cs169/187205159-structure-assignments-con…
Zzz212zzZ Apr 11, 2024
6fad81b
test coverage badge update
Apr 12, 2024
99ac766
test coverage badge update 2
Apr 12, 2024
ce28eee
code climate yml file updated
Apr 15, 2024
5a95b68
code climate yml file updated 2
Apr 15, 2024
7c3daa6
badge fix to linux
Apr 15, 2024
7bf1605
Fix bug: Change over the database.yml config file
Zzz212zzZ Apr 15, 2024
6f29315
Add User and LmsCredential models
Zzz212zzZ Apr 15, 2024
475b34e
Add Token Encryption/Decryption Credential in two envs
Zzz212zzZ Apr 15, 2024
f5cea0e
Add token encryption/decryption test
Zzz212zzZ Apr 15, 2024
fbd7a8e
Fix CI/CD bug: for the db:migrate in github CI/CD, we should save the…
Zzz212zzZ Apr 15, 2024
c4ce659
Add the secret key in the CI/CD workflow
Zzz212zzZ Apr 15, 2024
6c6483d
Merge branch '187409834-fix-flextentions-typo' of https://github.com/…
Zzz212zzZ Apr 16, 2024
c572a9f
Fix the typo in database.yml
Zzz212zzZ Apr 16, 2024
bc9351e
EMERGENCY FIX!: revert breaking changes to db file
Connor-Bernard Apr 16, 2024
1baa00c
Merge pull request #30 from cs169/187409834-fix-flextentions-typo
armandofox Apr 16, 2024
56ec30f
Merge pull request #31 from cs169/187434515-encrypt-auth-creds
armandofox Apr 16, 2024
df07fa1
[FEAT] Structure Users Controller (#25)
cynthia-lixinyi Apr 16, 2024
b606779
[FEAT] Validation Helper (#33)
Connor-Bernard Apr 17, 2024
55d1157
[FEAT] Create Canvas Facade (#32)
Connor-Bernard Apr 18, 2024
cff64fb
added codeclimate test reporter
Apr 18, 2024
c482fc2
added gems
Apr 18, 2024
d056f63
simple cov version downgraded
Apr 18, 2024
e6c7c8a
ci: update ci with canvas url
Connor-Bernard Apr 19, 2024
8b80fd2
Revert "ci: update ci with canvas url"
Connor-Bernard Apr 19, 2024
c4ff0e9
ci: update ci with canvas url (#34)
Connor-Bernard Apr 19, 2024
74579c6
simplecov v17
Apr 20, 2024
6b8217d
secret added
Apr 20, 2024
e9f506c
secret added2
Apr 20, 2024
4eddb45
secret added3
Apr 20, 2024
edc2e7d
secret added4
Apr 20, 2024
9b7300d
[FIX] added space in schema for canvas data (#36)
ekandell Apr 20, 2024
b54b085
Merge pull request #38 from cs169/187302440-fixing-test-badge
Sep26 Apr 22, 2024
956061a
initial changes to create user
Apr 22, 2024
2c2c8af
drafted
Apr 22, 2024
591bc3f
validation email added
Apr 22, 2024
3a398b5
chnages added: new+save, has many asso for extension
Apr 23, 2024
0c35b2d
Merge pull request #42 from cs169/187434149-flow-to-create-user
Sep26 Apr 23, 2024
5f0f654
187434183 set up flow to create course (#40)
cynthia-lixinyi Apr 23, 2024
72478b7
seed database (#37)
ekandell Apr 24, 2024
e9162bb
Implemented add_user in courses controller (#44)
cynthia-lixinyi Apr 24, 2024
6dbd465
Update README.md (#45)
cynthia-lixinyi Apr 26, 2024
6b89523
[Add]: structure flow to create the assignment new [new pr] (#43)
Zzz212zzZ Apr 28, 2024
cd1ed11
[Add]: set up flow to add lms to course (#41)
Zzz212zzZ Apr 28, 2024
601a5c7
Final workflow (#47)
ekandell Apr 30, 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
Prev Previous commit
Next Next commit
validation email added
Sepehr Behmanesh Fard committed Apr 22, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 591bc3f79ce48d4c7a1ccdb7fdd8a496d6fd4c06
1 change: 1 addition & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# app/models/user.rb
class User < ApplicationRecord
validates :email, presence: true, uniqueness: true
validates :email, format: { with: URI::MailTo::EMAIL_REGEXP, message: 'must be a valid email address' }

# Associasions
has_many :lms_credentials, dependent: :destroy