Skip to content

Commit

Permalink
Release/v0.5 (#108)
Browse files Browse the repository at this point in the history
* Updating /client docs

* add filter on classes; add sort alphabetically on session name; update db on session active toggle

* Added basic errors for logins

* Added bearer auth to /toolbox request

* WIP: Not populating with data

* created hasSession policy

* added custom update logic and moved the util functions into session service

* fix sessions table populating bug

* move setSessions into getClassrooms callback

* changed code generation and made the code a string to support leading 0s

* fixed session table and mentor update perm in db dump

* fix workspace UI bugs

* added policy to create mentor and added custom logic

* init test

* fix init mentor tests

* init documentation and other tweaks

* init k6 load test

* update scripts and dependenices

* finished join code/teacher login UI

* began student login view

* add and populate student name/animal dropdowns

* use array of ids on student jwt token

* fix student/me endpoint; fix setUser session bug

* set placeholder for student login selectors

* fix 'lo0se join code on refresh' bug

* css refactor and minor styling fixes to workspace

* style student view; handle routing to workspace for activity

* added fault protection to policies

* added validator service

* fixed join logic and beefed up other session controllers

* finished stuents/me and simplified student user token

* await the attach call for new students to a session

* fix postJoin function in client

* join with studentId as ints

* Added sandbox view and basic routing, need /toolbox/all

* Created /all request and cleaned up leftover code from workspace

* added sandbox toolbox endpoint

* make /sandbox/toolbox

* fix errors and warnings on render of new views

* broke out sandbox toolbox endpoint to its own controller

* updated db dump

* fix set state before mount

* remove useCallback

* remove dashboard logging

* Fixed render error for toolbox map

* student view styling fix

* Added sandbox button back

* removed old config

* updated frontend routes

* Update README.md

add style info to readme

* Update README.md

add info on how to enable web serial api

* fix home page styling

* added favicon; change index.html title to CASMM

* begin redoing mentor view with class cards

* In strapi admin: use casmm theme, update favicon, and add casmm-logo

* set admin homepage title

* set grid layout for classroom cards in dashboard; start roster view

* set grid layout for classroom cards in dashboard; start roster view

* add routing for /roster/:id; create table of students with edit feature

* settings for serving admin seperate in the future

* only use en translation

* increase margin on admin panel menu logo; add logo to login and style

* add MentorSubHeader component and implement in dashboard and roster.

* create togglable list/card views for roster view

* fix header-nav styling; fix miscellaneous console warnings/errors

* fix styling issues on dashboard and roster

* created BlocklyCanvasPanel component and implemented in workspace and sandbox

* create component for reusable activity info panel

* remove unnecessary divs

* remove unnecessary divs

* move styling from workspace to panel components; add navigation to canvas panel via props

* migrated session logic/routes to classroom

* added int validator function

* added code to classroom and created seperate teacher entity

* stripped session content type down

* created generic classroomManager policy and updated routes and related perms

* fixed weird forEach not returing bug

* if student role doesn't exist set user undefined

* create the basic roles if bootstrap function

* don't try to create a role, just log

* update db dump

* cms -> server && stem-c -> casmm

* use yarn in compile

* add mentor activity view; add activity catalogue view

* add autocomplete searchbar to activity catalogue

* update review workflows

* Create start-review.yml

* updated init script perms

* rm server frontend files

* fix bundling

* fix list view hrefs

* fixed client requests to handle new data models

* added view student modal to roster

* i goofed and left out the s

* fix modal bug

* add enrolled attribute to student model; add set enrollment status endpoint

* fix toggle enrollment validation bug; toggle enrollment from roster list view

* Fetch activities to populate catalogue; re-set student state on toggle enrolled

* Create end-review.yml

* Update end-review.yml

* update review flows

* fix name in docker compose

* add and implement hasStudentsClassroom policy

* update client built amd move

* fix build

* fix review misspelling

* add new routes to middleware

* i'm over it

* this shouild do the trick

* multiple stage build and update push

* add update student endpoint; edit students in roster updates db

* fix view student modal displays

* update dockerignore

* compile server stage into final for server os

* add casmm to client

* deploy script

* use new deploy script in all workflows

* fix deploy script

* add get pr

* add github token

* encapsulate variable

* fix typ

* add token to the other workflows

* prepend review-pr- in update review

* don't use minor version on a release

* update script

* don't use multistage builds for now for better caching

* don't use docker copy

* build client in app folder

* implement new header nav for mentor views

* Bump lodash from 4.17.15 to 4.17.19 in /test

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <[email protected]>

* add classroom view

* fix client bundling in build

* move catalogue and roster to tabs in classroom view; handle tab routing;

* update testing framework and commit test db dump

* remove teacher from create classrooms

* don't exit 0 from script

* include && for client bundling

* update dump and require enrollment

* Update README.md

* Update README.md

* Update README.md

* Added workflow for tagging onto master

* move navigation opptions from secondary header to dropdown nav

* add classroom home tab component; add join code display modal

* removed old content models

* create block_db.dump to copy blocks/categories to a new db

* let blocks_db.dump slide

* implemented new content models

* update dev dump

* set layout for /classroom/:id#home; fix sticky header

* add toolbox to day

* updated dump

* add grade validation to create classroom

* days have blocks

* update dump

* add learning standard selection modal; add checkbox to filter visible units

* implement modal navigation

* refactor ActivityCatalogue to LearningStandardSelect

* added student classroom retrieval

* narrowed scope of /students/me

* overrode the selection create controller to disable previous selection

* updated dump

* set active learning activity via modal; populate classroom modal and home with learning activity info

* display learning standards by unit; fix search functionality for new data organization

* implement filter on unit functionality

* maintain navigation history of modal state

* fix routing errors; clean up client warning/errors

* begin refactor of activity -> day

* use build github action

* update something

* use env var for heroku token

* finish activity -> day refactor; fix student views; remove redundant selectedDay props

* give CM access to toolbox in dev dump

* use v0.6 of build-test-deploy

* remove old heroku config files

* fix classroom rout; fix join code modal size; handle no fetch classroom error in student view

* create error checking request wrapper function; begin refactoring client for use with makeRequest

* use makeRequest for all requests; check for data/err when called

* classrooms route was getting ovverode

* Bump elliptic from 6.5.2 to 6.5.3 in /server

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

* add error message in views; add success message for some put/posts

* change canvas panel icon for goBack

* change error messages; fix fetching errors

* fix errors and warnings

* fix issue loading sandbox

* remove redundant default error setting

* created saves

* create findByDay and init create save

* Bump elliptic from 6.5.2 to 6.5.3 in /client

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

* change makeRequest args to config obj; getToken in makeRequest; log error

* finished create save

* updated db dump

* cleanup

* fix update save bug

* implement autosave on load, close, and every 5 min

* begin implementing load saves

* implement loadable saves; update loadable save options after manual save

* fix autosave time (5 min); add warning message when compilation fails

* Updated tag-master workflow with hotfix version

* rm old naming of cms...

* check student enrollment status on initJoin and join

* autosave more often; fix save erase on load; autoload save; label changes; move load button

Co-authored-by: Adam Tamargo <[email protected]>
Co-authored-by: Dakota <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
4 people authored Aug 8, 2020
1 parent b0c1bb2 commit cadaa33
Show file tree
Hide file tree
Showing 126 changed files with 3,459 additions and 2,637 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
- name: Built, test, and deploy app
run: ./scripts/build_test_deploy.sh
uses: STEM-C/auto/[email protected]
with:
image_name: server
image_tag: ${{ steps.get_version.outputs.VERSION }}
app_name: casmm
app_type: web
github_token: ${{ secrets.GITHUB_TOKEN }}
env:
IMAGE_NAME: server
IMAGE_TAG: ${{ steps.get_version.outputs.VERSION }}
APP_NAME: casmm
APP_TYPE: web
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
15 changes: 8 additions & 7 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ jobs:
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/heads/release/}
- name: Built, test, and deploy app
run: ./scripts/build_test_deploy.sh
uses: STEM-C/auto/[email protected]
with:
image_name: server
image_tag: staging-${{ steps.get_version.outputs.VERSION }}
app_name: casmm-staging
app_type: web
github_token: ${{ secrets.GITHUB_TOKEN }}
env:
IMAGE_NAME: server
IMAGE_TAG: staging-${{ steps.get_version.outputs.VERSION }}
APP_NAME: casmm-staging
APP_TYPE: web
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
13 changes: 7 additions & 6 deletions .github/workflows/start-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ jobs:
DATABASE_URL: ${{ steps.app.outputs.database_url }}
SCRIPT_PATH: ./scripts
- name: Built, test, and deploy app
run: ./scripts/build_test_deploy.sh
uses: STEM-C/auto/[email protected]
with:
image_name: server
image_tag: ${{ steps.app.outputs.app_name }}
app_name: ${{ steps.app.outputs.app_name }}
app_type: web
github_token: ${{ secrets.GITHUB_TOKEN }}
env:
IMAGE_NAME: server
IMAGE_TAG: ${{ steps.app.outputs.app_name }}
APP_NAME: ${{ steps.app.outputs.app_name }}
APP_TYPE: web
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: chrnorm/deployment-action@releases/v1
name: Create GitHub deployment
if: success()
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/tag-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
# check out the repository
- name: Checkout
uses: actions/checkout@v2

- name: Tag Master
uses: STEM-C/auto/tag@v0.5
uses: STEM-C/auto/tag@v0.6.1
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
repo_token: "${{ secrets.GITHUB_TOKEN }}"
15 changes: 8 additions & 7 deletions .github/workflows/update-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
id: get_name
run: echo ::set-output name=NAME::review-pr-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
- name: Built, test, and deploy app
run: ./scripts/build_test_deploy.sh
uses: STEM-C/auto/[email protected]
with:
image_name: server
image_tag: ${{ steps.get_name.outputs.NAME }}
app_name: ${{ steps.get_name.outputs.NAME }}
app_type: web
github_token: ${{ secrets.GITHUB_TOKEN }}
env:
IMAGE_NAME: server
IMAGE_TAG: ${{ steps.get_name.outputs.NAME }}
APP_NAME: ${{ steps.get_name.outputs.NAME }}
APP_TYPE: web
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEROKU_API_KEY: ${{ secrets.HEROKU_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ yarn-error.log*
*.sql
.cache/
*.dump
!blocks_db.dump
!development_db.dump
!test_db.dump

Expand Down
13 changes: 0 additions & 13 deletions app.json

This file was deleted.

17 changes: 7 additions & 10 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react'
import React from 'react'
import { Route, Switch, useHistory } from 'react-router-dom'
import PrivateRoute from './Utils/PrivateRoute';

Expand All @@ -9,13 +9,11 @@ import Student from "./views/Student/Student"
import NotFound from "./views/NotFound"
import StudentLogin from "./views/StudentLogin/StudentLogin";
import Sandbox from "./views/Sandbox/Sandbox"
import Roster from "./views/Roster/Roster";
import {removeUserSession} from "./Utils/AuthRequests";
import Activity from "./views/Activity/Activity";
import ActivityCatalogue from "./views/ActivityCatalogue/ActivityCatalogue";
import Day from "./views/Day/Day";
import Classroom from "./views/Classroom/Classroom"

const App = () => {
const [selectedActivity, setSelectedActivity] = useState('');
let history = useHistory();
const handleLogout = () => {
removeUserSession();
Expand All @@ -28,12 +26,11 @@ const App = () => {
<Route exact path={"/"} render={() => <Home history={history} />}/>
<Route exact path={"/login"} render={() => <StudentLogin history={history} />}/>
<PrivateRoute exact path={"/dashboard"} render={() => <Dashboard history={history} handleLogout={handleLogout}/>}/>
<PrivateRoute exact path={"/student"} render={() => <Student history={history} selectedActivity={selectedActivity} setSelectedActivity={setSelectedActivity}/> } />
<Route path={"/workspace"} render={() => <Workspace selectedActivity={selectedActivity} history={history} handleLogout={handleLogout}/>}/>
<PrivateRoute exact path={"/student"} render={() => <Student history={history}/> } />
<Route path={"/workspace"} render={() => <Workspace history={history} handleLogout={handleLogout}/>}/>
<Route path={"/sandbox"} render={() => <Sandbox history={history}/>} />
<PrivateRoute exact path={"/roster/:id"} render={() => <Roster history={history} handleLogout={handleLogout}/>}/>
<PrivateRoute exact path={"/activity"} render={() => <Activity selectedActivity={selectedActivity} history={history} handleLogout={handleLogout}/> } />
<PrivateRoute exact path={"/catalogue"} render={() => <ActivityCatalogue setSelectedActivity={setSelectedActivity} history={history} handleLogout={handleLogout}/> } />
<PrivateRoute exact path={"/day"} render={() => <Day history={history} handleLogout={handleLogout}/> } />
<PrivateRoute path={"/classroom/:id"} render={() => <Classroom history={history} handleLogout={handleLogout}/> } />
<Route component={NotFound}/>
</Switch>
</div>
Expand Down
Loading

0 comments on commit cadaa33

Please sign in to comment.