Skip to content

Commit

Permalink
Merge Master (#294)
Browse files Browse the repository at this point in the history
* S6 db refactor (#188)

* dealt with errors, dealt with redundant api calls

* backend refactor start

* Learning how2db

* Less debug output

* Autobackup db

* backup kida working xD

* Testing fixes - still not perfect but meh

* Permanent dbs

* Looks like we working

* Update courses.js

removed comment

* Update stub-db.js

removed old code

* Fixed search bug whilst here

* Fixed some of the issues

* Debug info removed

* Prod now not prod

* S5 frontend pagination (#166)

* Backend pagination added

* backend pagination + basic error check

* Fixed the check (swear it worked on mine lol)

* Pagination for Questions/Reviews

* Fixed lint issues

* Backend pagination fixes

* Moved some of the pagination logic out to a component

* Backend didn't merge properly before

* Lint fixes

* Frontend merging with pagination

* frontend pagemeta state

* Backend dependent on pageSize

* Tests had to be changes because response now has {meta, data} instead of just an array

* linter yelling at me

* Made page buttons sligtly more attractive

* Fixes based on review

* PageSelector only shows if there are multiple pages avail

* Fixed typo's when copying

* S7 Further Design Normalisation (#189)

* further normalisation of designs

* more normalising on fonts

* Copy update

* updates to home page

* added robots.txt

* Course Ratings Frontend (#193)


* added an arc for ratings

* getting my head around svgs

* Ratings

* now with animations

* simplified reviews

* S6 better reviews (#194)

* Slidey boy

* Added course recommend and fixed up slidey boy

* Added reccomend to tests

* backend post review stuff - untestederino

* seemingly working review ratings added to db

* fixed enjoy values in backend

* working course ratings! (kinda)

* rating circles stay up to date now

* fixed review POST test

* review option columns changerino - now fills whole width of review form

* S7 upvotes (#209)

* Basic PUT request working

* Started frontend for things, not properly conencted, bit more work needed

* Up and down voting working

* Upvote reviews too

* Questions, reviews, answers and replies all can be up/downvoted

* Pass dem tests

* Im a bad merger

* Cleanup

* Constants for Alex

* S8 review card recommended basic (#207)

* ugly thumbs to denote review recommended or not

* smol fix on aggregation of recommended

* fixed smol linting thing

* slightly less bad thumb position

* reverted changes to review card to keep this branch useful

* hide ratings if no reviews yet

* clear comment form after answering

* fixed test

* S8 Design Updates (#211)

* ugly thumbs to denote review recommended or not

* smol fix on aggregation of recommended

* fixed smol linting thing

* argghhh

* slightly less bad thumb position

* more progress

* more designinggg

* more fixes

* okay moving on to the feeds now

* slowly getting there

* removed old firebase key

* next step is to tackle the feed cards

* added caching

* reverted changes to review card to keep this branch useful

* hide ratings if no reviews yet

* clear comment form after answering

* adjust feed

* oops

* S8 db dev data (#212)

* Questions and Reviews

* Comments populating

* Done comments

* Fixed tests to be more generic

* Made test data longer and varied length

* S8 Card Feeds (#219)

* Questions and Review Feed Updates

* changed smartcourse.azurewebsites.net to smartcourse.me (#226)

* Shorter Course Information Data (#225)

* S8 signup flow basic profile (#213)

* signup now in two stages; create firebase account, and create profile

* signup flow more logical now ... handles most edge cases pretty well

* basic profile page - still buggy, non functional update profile button

* local default picture

* update user backend added... no tests

* lint errors fixed

* working profile update

* fixed textarea stuff, watcher to fix refresh profile problem

* profile picture update added

* working password reset from login form

* nice error message for non-unique username

* made hasProfile dependent on isLoggedIn to alleviate some potential bad

* removed TODO

* fixed post review/question bug when logged in

* loading state for nav, split auth and profile get into two bits

* reverted some stuff ... working again

* better auth code, profile cache, global loading spinner in nav, reroutes

* lint

* page size fixaroo

* I'v messed something up

* protecting routes with guards

* fixed some PR things

* smol fixes

* removed preAuth route check - not needed rn

* smol fix to login page reroute

* Fixed feed lieks (#229)

* S9 reduced descriptions (#230)

* some simple filtering

* Slightly better descriptions

* S8 comment pagination (#208)

* Backend pagination for comments

* Cleaned up exiting controller pagination code and lint/test fixes

* Oops, fixed that

* Does this fix it

* fixed test - body is now meta+data

* Fixed breaking test

* Revert "S8 comment pagination (#208)" (#235)

This reverts commit 68bd7da.

* S8-Design Tweaks Part 4 (#231)

* Reworked Main Card Views
* Built out new Components
* More Design Refactoring

* S8 restrict api (#232)

* Simple auth safety

* Working auth restrictions

* Get an account

* working progress

* promt to login

* other fixes

* Damn tests

* That ones on me

* S9 loading state (#236)

* loading state on all views, only get courses once on app load

* course map + array lots of storage used... but should be speedier!

* separated loading feed state from loading course info

* pretty sure the beforeRouteUpdate re-load isn't needed on courses

* split up question view loading into question and answers

* split loading state in reviews

* lint

* kinda nice loading transitions in most places, plus removed a thing

* performance

* S9 time published (#237)

* Date is in the form X <time> ago

* Fixed UTC/LOCAL offsets

* Fixed import

* S9 Button Fixes  (#239)

* button fixes

* Posts have user info (#238)

* user Object added to all questions, reviews comments, added fake users

* small improvement to courses efficiency

* answers and replies now have user data, added reputation to user data

* mappers for question and review get user object now..

* feed cards get username correctly now!

* user data on all cards now

* disabled vote buttons completely if not logged in

* hide degree if user hasn't entered one

* better dummy data

* picture in Mini - but not actually hooked up cos cbf css

* fixo testo!

* lint

* smol bugfix prob my bad

* S9 SQL Optimisations (#243)

* Optimisations to SQL Queries

* S9 question card num answers (#241)

* added numReplies to api query for questions feed

* way too much effort adding names, degrees n junk hehe

* question feed now shows number of answers!

* course ratings update on GET

* disabled like buttons when not logged in...

* likes added to everything

* minimum 0 for 'x users found this helpful'

* removed profile caching, fixed post buttons bug, Create Profile nav

* pr fixesszz

* Pagination bug fix for off by 1 (#240)

* Faculty degree data (#246)

* Degree data

* degrees and faculties in database and nice and routed af

* bugfix on getting course info

* S9 Comment Feed Rework (#247)

* sort answers by hotness and put most upvoted at the top

* removed toggle of classes & fixed a bug

* fixed post answer test

* answer section not hidden if 0 answers

* bit of code cleanup, nicer loading state

* moved answer loading state above answers - even better!

* more cleanup, fixed disable messages, accepted answer border

* replies now sorted by hotness (no accepted answer), reply form updated

* course control button tooltip fix

* S9 unlikes (#252)

* Simple auth safety

* Working auth restrictions

* Get an account

* Progressss

* Working

* remove some logs

* forgot this log

* working now it seems

* Yeah don't know how that got back

* very basic profiles without attempting to make anything pretty (#242)

* very basic profiles without attempting to make anything pretty

* removed a comment

* Revert "very basic profiles without attempting to make anything pretty (#242)" (#256)

This reverts commit e07dc11.

* S9 faculty degree (#253)

* Frontend store stuff

* Caching

* Caching actually works now :)

* Removed loading as it should load once on init

* S9 tos (#254)

* Based func for ToS on Signup

* A little bit of formatting

* Privacy Policy & Tabs

* S9 Review Overview (#258)

* Amended likes logic

* lots of updates -- recommend now showing, failing one test in user

* S9 reputation (#255)

* Simple auth safety

* Working auth restrictions

* Get an account

* Progressss

* Working

* remove some logs

* forgot this log

* dem reps

* working now it seems

* Yeah don't know how that got back

* for alex

* im dum dum

* bless the nunez

* whoopsie

* Works helllllz yeah

* don't be negative

* one bug to fix stilll

* bug

* bout time

* I HATE JAVASCRIPT

* pluralization correct for feed cards now (#259)

* fixed bug with likes toggle functionality on refresh question/review (#261)

* S9 course list filter search & sorting options (#265)

* Footer linked up or cursor disabled (#264)

* Footer linked up or cursor disabled

* Fixes

* Added, Fixed & Tested

* S9 Public User Profiles (#257)

* very basic profiles without attempting to make anything pretty

* removed a comment

* lint

* the great Number String debacle of 2018 ... fixed for now.

* progressing on profile

* updates to login, signup, create-profile visuatiolns

* fixed branch

* minor feature addition

* progress commit for @nun

* somewhat improve myprofile page

* small header fixup

* nuno plz make better

* griiiiid

* slice that join!

* S10 profile polish (#267)

* more consistency updates

* Category component bug (#268)

* fixed the bug...

* fixed properly now...

* fix for page selector

* Updates to Button Style for sorting (#277)

* Bugfixes for demo data initialisation (#273)

* dummy user data now has reputation and uses degree data

* lint frontend

* lint backend

* fixed some promise bugarinos and added timers to initialization

* dummy reviews now initialised with all ratings present

* many speedup, due to bulk insert and limiting num courses populated

* bugfix recommend text in review card

* sort courses bugfix

* fixed Recommendeds

* sort fix for answers

* Move DB init over to SQL (#276)

* changes to db init

* tests now pass

* not quite there, added user init, but some issue with questions not being all inserted

* hmmm

* hmm

* fixed

* tightening tests again

* minor updates

* integrating nuno's development server changes

* still a bit shit to be usable in development with the 30s lag

* upgrade to version 0.1.0

* S10 sqlerise db init 2 (#279)

* better

* less quries

* moooore

* fix 1 trav error

* fixed test rep

* just seeing

* just seeing 2

* just seeing 3

* Istanbul excludes more files for coverage and reports (#288)

* excludes more files

* amended cors, added basic tests

* Added more tests, cors bugfix (#290)

* Standardise Backend API to use constants, fix for time on Safari (#291)

* initial commit

* at least

* fixed

* need todo a larger refactor for likes

* Better test data (#293)

* initial commit

* at least

* fixed

* need todo a larger refactor for likes

* big changfe

* Minor bug from dev init (#295)

* init

* fixed

* forgot this
  • Loading branch information
DarkPurple141 authored Nov 27, 2018
1 parent a264669 commit 6067b0b
Show file tree
Hide file tree
Showing 175 changed files with 7,320 additions and 1,631 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ yarn-error.log*

backend/public
backend/db
backend/src/models/db/sql/test/*
test.db
package-lock.json
*.zip

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Coverage Status](https://coveralls.io/repos/github/SmartCourse/app/badge.svg?branch=dev&service=github)](https://coveralls.io/github/SmartCourse/app?branch=dev)

## Builds and Deployment
Our production build is automatically deployed when code is merged with master. The current production build can be found at: http://smartcourse-prod.azurewebsites.net/
Our production build is automatically deployed when code is merged with master. The current production build can be found at: http://smartcourse.me/

Our staging build is automatically deployed when code is merged with dev. The current staging build can be found at: https://smartcourse-staging.azurewebsites.net/

Expand Down
2 changes: 1 addition & 1 deletion backend/data/course_data_2019.json

Large diffs are not rendered by default.

Loading

0 comments on commit 6067b0b

Please sign in to comment.