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

Implemented all features, question title, zone, pool, import, and some minor ui update. #29

Open
wants to merge 195 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
74625ec
Changed the credentials for github, new dev app.
KCsama Feb 21, 2023
5167d80
Merge pull request #1 from cs169/credential
KCsama Feb 21, 2023
8fdbba8
Updated the gemfile to contain faraday
KCsama Feb 21, 2023
30b4c98
updated gem and bundle
KCsama Feb 21, 2023
941800b
provoder state and code climate
KCsama Feb 22, 2023
db92209
Update README.md
KCsama Feb 22, 2023
5c2f430
Update README.md
KCsama Feb 22, 2023
6b21a22
update readme
KCsama Feb 22, 2023
b14f60b
modified credential
KCsama Feb 22, 2023
8201ff1
added badge for ci
KCsama Feb 22, 2023
441d059
Update README.md
KCsama Feb 22, 2023
f1bba60
update on ci.yml
a544266477 Feb 25, 2023
ce369ab
change back.
a544266477 Feb 25, 2023
6f6237b
try migrate
KCsama Feb 25, 2023
c519497
try migrate again
KCsama Feb 25, 2023
aa6960a
change it back
KCsama Feb 25, 2023
357f5c2
omniauth fixed
Feb 28, 2023
55a051e
omniauth
KCsama Feb 28, 2023
85c4a6e
change
a544266477 Mar 1, 2023
3ae7742
Update info.yml
KCsama Mar 1, 2023
e338fe0
Update README.md
KCsama Mar 1, 2023
4bcb8f1
Update ci.yml
KCsama Mar 1, 2023
3a54d05
Update README.md
chithrarajan Mar 1, 2023
2540984
Merge branch 'credential' of https://github.com/cs169/PrairieLearn-EE…
a544266477 Mar 2, 2023
5b817b4
Merge branch 'credential' of https://github.com/cs169/PrairieLearn-EE…
a544266477 Mar 2, 2023
11982ef
Merge branch 'credential' into heroku
a544266477 Mar 2, 2023
1506b4f
update credentials
a544266477 Mar 2, 2023
55968ad
Tried fix ci
a544266477 Mar 3, 2023
db08419
try fix ci
a544266477 Mar 3, 2023
2ba100a
try fix ci
a544266477 Mar 3, 2023
97f4b5f
try ci
a544266477 Mar 3, 2023
40b24d6
implicitly using cc id
a544266477 Mar 3, 2023
385fc3c
try implicitly cc id
a544266477 Mar 3, 2023
49cf9a7
use guobin's ccid
a544266477 Mar 3, 2023
b46d235
Merge branch 'main' of https://github.com/cs169/PrairieLearn-EECS int…
a544266477 Mar 3, 2023
b448b7b
Merge pull request #4 from cs169/credential
a544266477 Mar 3, 2023
b033cd5
added search bar html
Mar 3, 2023
e6ae829
search bar
fp456 Mar 7, 2023
f65db2a
change on token update
a544266477 Mar 7, 2023
9db3e29
Merge branch 'credential' into heroku
a544266477 Mar 7, 2023
d6b3ece
update credentials
a544266477 Mar 7, 2023
9cb8a49
update token if out of date
a544266477 Mar 7, 2023
52ffb53
Search bar done
fp456 Mar 8, 2023
fd0d588
saved
fp456 Mar 8, 2023
336c23a
Merge branch 'search_bar' into heroku
a544266477 Mar 8, 2023
9810644
update credential
a544266477 Mar 8, 2023
c39bfb6
Update info.yml
KCsama Mar 8, 2023
6b128f4
Update README.md
KCsama Mar 8, 2023
35d7645
Update info.yml
KCsama Mar 8, 2023
c62b12e
change on credetials
a544266477 Mar 10, 2023
6b9ad41
fix login controller
a544266477 Mar 10, 2023
b3cf0e8
Starting new model
fp456 Mar 12, 2023
05bd5c2
Added persistance across search
fp456 Mar 12, 2023
d7f4f93
no change
a544266477 Mar 12, 2023
5316a8b
Merge branch 'search_bar' of https://github.com/cs169/PrairieLearn-EE…
a544266477 Mar 12, 2023
6685323
update credential
a544266477 Mar 13, 2023
a5149d7
try building the search by mysself
a544266477 Mar 13, 2023
56db3a7
search bar done but need drying
KCsama Mar 13, 2023
c970f9a
deploy search bar
Mar 13, 2023
639b558
merge search_bar
Mar 13, 2023
289ceb3
hidden the pts and remove element after remove
Mar 14, 2023
9953ccd
hidden the pts and remove element after remove
Mar 14, 2023
d7852d6
merge new change
Mar 16, 2023
d857499
try bluejay
a544266477 Mar 17, 2023
bfee737
change ci
a544266477 Mar 17, 2023
63b8a68
Update info.yml
a544266477 Mar 17, 2023
6b1acd9
Update info.yml
a544266477 Mar 17, 2023
eece918
Update info.yml
a544266477 Mar 17, 2023
ca80f1c
Update info.yml
a544266477 Mar 17, 2023
438d439
Update info.yml
a544266477 Mar 17, 2023
3e943bc
Update info.yml
a544266477 Mar 17, 2023
95ca903
Update info.yml
a544266477 Mar 17, 2023
c22930d
update changes
Mar 17, 2023
0227628
Merge branch 'search_bar' into heroku
a544266477 Mar 17, 2023
77b6844
Merge branch 'heroku' of https://github.com/cs169/PrairieLearn-EECS i…
a544266477 Mar 17, 2023
d1fb009
new changes
a544266477 Mar 17, 2023
432cdf4
Update README.md
KCsama Mar 17, 2023
9517298
change the boolean to int value for selected
Mar 21, 2023
88f58e1
Update schema.rb
KCsama Mar 21, 2023
92d0bf4
Merge remote-tracking branch 'origin/search_bar' into heroku
a544266477 Mar 21, 2023
c994c9b
delete the add migrating
a544266477 Mar 21, 2023
53f9cbd
change on migratiing
a544266477 Mar 21, 2023
a58722c
fix bugs
a544266477 Mar 21, 2023
99081c8
Revert "hidden the pts and remove element after remove"
a544266477 Mar 21, 2023
30277f9
Revert "hidden the pts and remove element after remove"
a544266477 Mar 21, 2023
e502215
Revert "Update schema.rb"
a544266477 Mar 21, 2023
a97f284
Revert "change the boolean to int value for selected"
a544266477 Mar 21, 2023
192655f
Merge github.com:cs169/PrairieLearn-EECS into search_bar
a544266477 Mar 21, 2023
e79edb2
Merge branch 'search_bar' into heroku
a544266477 Mar 21, 2023
bfaf9dd
update database
a544266477 Mar 21, 2023
bf9ae94
bug fixed
a544266477 Mar 21, 2023
72ecf3d
create zone html
a544266477 Mar 24, 2023
67c7933
finished zone json output
a544266477 Mar 24, 2023
09e7d0a
Merge branch 'zone' into heroku
a544266477 Mar 24, 2023
5443c73
merge the change of routes
a544266477 Mar 24, 2023
7d5bdfd
pulling descriptive question titles from info.json and trying to put …
Mar 24, 2023
12dff5c
Merge pull request #5 from cs169/zone
a544266477 Mar 25, 2023
d4b4e43
made question titles show up in sidebar
Apr 5, 2023
624c960
finished html
a544266477 Apr 5, 2023
70e3e21
Merge branch 'question_title_descriptive' into zone
a544266477 Apr 5, 2023
1ac3cad
finished zone and title and alternatives
a544266477 Apr 5, 2023
cccf772
Merge branch 'zone' into heroku
a544266477 Apr 5, 2023
956ad06
change search to search both id and title
a544266477 Apr 5, 2023
445609e
Merge branch 'zone' into heroku
a544266477 Apr 5, 2023
adf8eb7
change ILIKE for postgre
a544266477 Apr 5, 2023
c06858f
change lowercase
a544266477 Apr 6, 2023
ebb90d6
lowercase
a544266477 Apr 6, 2023
2ef61b5
lowercase
a544266477 Apr 6, 2023
9758296
lower
a544266477 Apr 6, 2023
b8703a6
lowecase column
a544266477 Apr 6, 2023
939eaac
Merge branch 'main' into zone
a544266477 Apr 6, 2023
9986955
little ui change
a544266477 Apr 8, 2023
a20d1c3
Merge branch 'zone' of https://github.com/cs169/PrairieLearn-EECS int…
a544266477 Apr 8, 2023
5e6bbe3
Finalized persistance for questions
fp456 Apr 10, 2023
e966739
resolved conflicts
fp456 Apr 11, 2023
90133c6
latest version
fp456 Apr 11, 2023
4dd3f9b
Fixing containers
fp456 Apr 11, 2023
09fc7a0
persistance for zones and questions
fp456 Apr 11, 2023
b20fedc
Merge branch 'persistance' into heroku
fp456 Apr 11, 2023
ece36aa
merging
fp456 Apr 11, 2023
89f1da8
Cmerging'
fp456 Apr 11, 2023
368efad
fixing remove
fp456 Apr 11, 2023
054a08b
finished zones
fp456 Apr 11, 2023
1318671
Merge branch 'persistance' into heroku
fp456 Apr 11, 2023
def00c5
updated the information button
KCsama Apr 13, 2023
2fc30bf
change size zone
a544266477 Apr 14, 2023
976caa8
add new pool
a544266477 Apr 14, 2023
99d5f5c
fixed remove buttons
fp456 Apr 14, 2023
05e3b04
Merge branch 'main' into heroku
fp456 Apr 14, 2023
89c5dbc
Merge pull request #8 from cs169/heroku
fp456 Apr 14, 2023
dc1e87f
need Dryer
a544266477 Apr 15, 2023
99b7f48
moved bottom button to top
KCsama Apr 19, 2023
8f11fdd
Add a pull request template
cycomachead Apr 19, 2023
efcf7bd
Clarify git branch name details
cycomachead Apr 19, 2023
cde70e5
Merge pull request #10 from cs169/cycomachead-patch-1
cycomachead Apr 19, 2023
7b56106
Update README.md
KCsama Apr 19, 2023
0c0d0fe
Update README.md
KCsama Apr 19, 2023
5709cd6
add reload warning, and remove test login
a544266477 Apr 21, 2023
9071d69
Fixed the unsafe issue
KCsama Apr 22, 2023
8b92e53
a fix on export
a544266477 Apr 22, 2023
05fa3e1
start a simple import
a544266477 Apr 23, 2023
3da1482
Merge branch 'main' into zone
a544266477 Apr 23, 2023
23c03b0
a fix on search
a544266477 Apr 23, 2023
57a2562
finished spinner, in order to get working must do bundle install
Apr 23, 2023
4d59ec6
changed button text from submit to synchronize
Apr 23, 2023
150a958
changed require statements in repo_controller to be at the top
Apr 24, 2023
0f47ccc
Merge pull request #9 from cs169/zone
a544266477 Apr 24, 2023
1dce609
finish adding
fp456 Apr 24, 2023
6cc613f
delete done
fp456 Apr 24, 2023
4cf9880
reading file
fp456 Apr 25, 2023
0acaaaf
reading files
fp456 Apr 25, 2023
0f0e818
retrieving fields
fp456 Apr 25, 2023
d4f1cdf
Reset file notes to 0644
cycomachead Apr 25, 2023
20ed1f1
Merge pull request #12 from cs169/file-mode-change-test
chithrarajan Apr 25, 2023
0815a9c
zone tests done and passing
Apr 25, 2023
2e01e00
fixing bugs
fp456 Apr 26, 2023
ed34afa
added headless selenium support to make test passin virtual environment
Apr 26, 2023
b807fd2
merge main into spinner
Apr 26, 2023
d0d75e0
update bin/rails to give correct perms
Apr 26, 2023
918c80d
removing zone test
Apr 26, 2023
d4c9409
pool bug
fp456 Apr 26, 2023
43080a3
fixed pool bug
fp456 Apr 26, 2023
e1da93f
populating all the fields
fp456 Apr 26, 2023
7b21f0b
changed file upload
fp456 Apr 26, 2023
d50d4d5
edge cases
fp456 Apr 26, 2023
e095338
deleted local storage code
fp456 Apr 26, 2023
b4e73b1
deleted file localstorage
fp456 Apr 26, 2023
33f350d
cleaned code
fp456 Apr 26, 2023
63a43b6
fixed draggable
fp456 Apr 26, 2023
b6c3fd5
fixed toggle bug
fp456 Apr 26, 2023
755f311
fixing name value
fp456 Apr 26, 2023
e2f2aac
fixed exporting issues
fp456 Apr 26, 2023
6d63940
fix the search
a544266477 Apr 26, 2023
fff3def
Merge pull request #14 from cs169/zone
a544266477 Apr 26, 2023
6109859
delete duplicate code in spec helper and rails he
a544266477 Apr 26, 2023
690033a
Merge pull request #15 from cs169/zone
a544266477 Apr 26, 2023
7e2ea9f
a fix on search to search key word correctly
a544266477 Apr 27, 2023
94d47f3
Merge pull request #11 from cs169/spinner
chithrarajan Apr 27, 2023
ae9dcf9
fix typo
a544266477 Apr 27, 2023
59e121b
fix the drop problem
a544266477 Apr 27, 2023
9300393
fix the dropped
a544266477 Apr 27, 2023
1d30e66
fixed zone tests passing locally with the new page structure and zone…
Apr 27, 2023
d19a420
fix on dropped
a544266477 Apr 27, 2023
baeafca
Merge pull request #16 from cs169/zone_test
chithrarajan Apr 27, 2023
ed50ad1
fix dropped
a544266477 Apr 27, 2023
df5a37d
Merge pull request #17 from cs169/zone
a544266477 Apr 27, 2023
95c56f1
Merge branch 'persistance_data' into main
a544266477 Apr 29, 2023
d765323
Revert "Merge branch 'persistance_data' into main"
a544266477 Apr 29, 2023
0196a0f
revert the change of merging main into the branch
a544266477 Apr 29, 2023
c54ecea
Merge pull request #19 from cs169/persistance_data
a544266477 Apr 29, 2023
1bc0bc2
Update .travis.yml
a544266477 Apr 29, 2023
e545976
deleted master.key, updated ci to read it from repo secrets
May 1, 2023
adddf3d
Merge branch 'main' of github.com:cs169/PrairieLearn-EECS into creds_fix
May 1, 2023
13c0408
trying to fix ci file format issues
May 1, 2023
42c6be4
Merge pull request #21 from cs169/creds_fix
chithrarajan May 1, 2023
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
31 changes: 31 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
### [Pivotal Tracker Link][tracker]

<!-- Complete this section filling in the link to a tracker story. -->
[tracker]: https://www.pivotaltracker.com/story/show/your-story-id

## What this PR does:
<!-- Complete the following sentence: -->

This pull request fixes|implements (pick one...) ______.

### Include screenshots, videos, etc.

#### Who authored this PR?
<!-- Tag the names of any other contributors -->


### How should this PR be tested?

* Is there a deploy we can view?
* What do the specs/features test?
* Are there edge cases to watch out for?

#### Are there any complications to deploying this?

<!-- Data migrations, upgrades, etc. -->

### Checklist:

- [ ] Has this been deployed to a staging environment or reviewed by a customer?
- [ ] Tag someone for code review (either a coach / team member)
- [ ] I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. `michael/12345-add-new-feature` Any branch name will do as long as the story ID is there. You can use `git checkout -b [new-branch-name]`)
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: build

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install Ruby 3.0.0
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.0

- name: Set up Code Climate test-reporter
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter before-build

- name: Install bundler
run: |
gem install bundler
- name: Install Dependencies
run: bundle install
- name: Set up test database
env:
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
run: |
bundle exec rake db:setup
bundle exec rake db:create db:migrate
- name: run Cucumber tests and capture coverage
env:
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
run: |
bundle exec cucumber
./cc-test-reporter format-coverage --output coverage/codeclimate.$SUITE.json --input-type simplecov
- name: run RSpec tests
env:
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
run: |
bundle exec rspec
./cc-test-reporter format-coverage --output coverage/codeclimate.$SUITE.json --input-type simplecov
- name: Publish code coverage
run: |
export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
./cc-test-reporter sum-coverage coverage/codeclimate.*.json
./cc-test-reporter upload-coverage --id ${{ secrets.CC_TEST_REPORTER_ID }}
./cc-test-reporter after-build --id ${{ secrets.CC_TEST_REPORTER_ID }}

20 changes: 17 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ gem 'jbuilder', '~> 2.7'
# gem 'image_processing', '~> 1.2'

gem 'omniauth'
gem "omniauth-github"
gem "omniauth-rails_csrf_protection"
gem 'octokit', '~> 4.0'

# Reduces boot times through caching; required in config/boot.rb
Expand All @@ -45,11 +47,13 @@ end
group :test do
gem 'rspec-rails'
gem 'guard-rspec'
gem 'simplecov', :require => false
gem 'simplecov', '~> 0.22.0', :require => false
gem 'simplecov_json_formatter', :require => false
gem 'cucumber-rails', :require => false
gem 'cucumber-rails-training-wheels' # basic imperative step defs like "Then I should see..."
gem 'database_cleaner' # required by Cucumber
gem 'simplecov', require: false
gem 'codeclimate-test-reporter', require: false
# gem 'capybara-webkit'
end

# make sure the following gems are in your production group:
Expand All @@ -61,6 +65,16 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "omniauth-github"

gem "active_type", "= 1.3.2"

gem 'faraday-retry'

gem "font-awesome-sass", "~> 6.4.0"

# gem 'jquery-rails'

gem 'jquery-rails', '~> 4.3', '>= 4.3.3'
gem 'rails-ujs', '~> 0.1.0'
gem 'database_cleaner'
gem "selenium-webdriver"
Loading