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

merge Backend #153

Merged
merged 79 commits into from Oct 30, 2021
Merged

merge Backend #153

merged 79 commits into from Oct 30, 2021

Conversation

alodahl
Copy link
Collaborator

@alodahl alodahl commented Oct 30, 2021

No description provided.

alodahl and others added 30 commits August 23, 2020 11:38
Co-authored-by: tilaprimera <tilaprimera@users.noreply.github.com>
* Fixes #65 - Finish ORM Setup
- Ensure we can connect to the DB before launching Express
- Use sqlite for normal dev mode; postgres for production
- Upgrade sequelize and postgres npm packages since the versions we were using hung trying to connect to pg
- Use the sequelize.sync functionality to automatically setup any table(s)

* Allow either type of DB in development mode
- in dev mode, have default DB_URL of sqlite
- in prod, DB_URL must be specified

* fix .gitignore to have correct sqlite db name

* clean up package.json scripts
…re served by http-server (now using express) (#62)
orm.js updated with model for UserAnswers
* fixed caps lock sync issue, capslock on is a keydown and capslock off is a keyup event

* deleted unecesseray if condition in handle function for capslock
Replace repetitive if blocks with lookup
y-martinez and others added 25 commits October 7, 2020 23:37
Add highlight for Fn key in case F1-F12 is pressed. Fixes #29
Used serve-icon middleware to serve favicon.
…stion

Fix #96: Add ability to retrieve timing history
Fix: #99 Change jquery CSS functions in main.js
* Fixes #74 - fake login/logout for local dev
  - refactor auth setup so it is the same for the rest of the code regardless if it's fake dev or Auth0
  - use express-session with sequelize store to handle sessions (they will persist dev reload)
  - add dummy login state message to bottom of index page so dev can use login/logout before buttons are added

* make .env.example a little more user-friendly

* add .git.local ignore so it can be used to switch between Auth0 and local dev without accidentally checking it in

* Fully integrate Auth0 and local dev
- Auth create user upon login or root request
- Protect all /user API routes to need a valid signed-in user or they will respond with 401
- fix ORM data models so they have default values and work correctly with postgres

* fix comments
…eries

Add indexes: user_answers_created_at_user_id_question_number, user_answers_created_at_user_id
* Fixes #74 - fake login/logout for local dev
  - refactor auth setup so it is the same for the rest of the code regardless if it's fake dev or Auth0
  - use express-session with sequelize store to handle sessions (they will persist dev reload)
  - add dummy login state message to bottom of index page so dev can use login/logout before buttons are added

* make .env.example a little more user-friendly

* add .git.local ignore so it can be used to switch between Auth0 and local dev without accidentally checking it in

* Fully integrate Auth0 and local dev
- Auth create user upon login or root request
- Protect all /user API routes to need a valid signed-in user or they will respond with 401
- fix ORM data models so they have default values and work correctly with postgres

* fix comments

* do not save or fetch data unless logged in

* fix get history endpoint to lookup by logged in user id from request

* Implements #77 - replaces all localStorage lookups with saved /user/progress API call
  - remove commented code
  - add const/let variable declarations when missing

* Add API integration specs using jasmine + supertest
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* - Add login and logout buttons to the top of the main page

* - Adjust account-info's margins

* - 2nd draft of login button. Account info is centered in the whitespace above the read container

Co-authored-by: Jackie Zhang <hausekey@github.com>
@alodahl alodahl changed the title marge Backend merge Backend Oct 30, 2021
@alodahl alodahl merged commit c2533ae into main Oct 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet