Skip to content

Commit 81ab3b1

Browse files
authored
Prototype 4 (#28)
feat: new prototype with separation between collection and evaluation This new prototypes separates the concern of collecting the responses and evaluating them. It also features a refactored UI. Release-As: 1.3.0 refactor: refactor all and upgrade chore(deps): upgrade commitlint chore(deps): upgrade mui chore(deps): upgrade vite refactor: improve process controls refactor: ideation -> response collection refactor: add pausable and rename some symbols refactor: processStatus -> activityStatus feat: activity control chore(deps): minor upgrades build(test): fix tests config build: fix commitlint config refactor: remove @graasp/ui chore(deps): minor upgrades refactor: remove immutable and upgrade query client BREAKING CHANGE: data structures may have changed docs: update README refactor: data management, types and naming moved most of the types from 'idea' to 'response' wording fix: use enum to specify app data type and other stylistic changes chore(deps): minor updates feat: responses mix beta this is a work in progress fix(settings): radio buttons feat: response mix beta 2 test: add vitest test: add tests for response utils feat: responses mix beta 3 feat: responses mix beta 4 work in progress fix: ResponseChoose fix: ResponseInput feat: responses mix beta 4 fix: force state selection with toggle button in admin view feat: reset activity button feat: ratings wip work in progress ratings according to usefulness and novelty impl settings to choose ratings type chore: remove unnecessary console ci: update workflows chore(deps): upgrade dependencies chore(deps): upgrade graasp dependencies fix(appData): buildAppDataKey -> appDataKeys ci(test): add build and preview scripts for tests build: fix vite config refactor(UI): fix response view spacings test: (re)configure cypress test: basic e2e test
1 parent 4b40ec1 commit 81ab3b1

File tree

82 files changed

+9826
-9676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+9826
-9676
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Build and Check
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
build:
8+
concurrency: build-${{ github.head_ref || github.ref }}
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: checkout
12+
uses: actions/checkout@v4
13+
14+
- name: Yarn Install and Cache
15+
uses: graasp/graasp-deploy/.github/actions/yarn-install-and-cache@v1
16+
17+
- name: Lint
18+
run: yarn check
19+
20+
- name: Build
21+
run: yarn build

.github/workflows/cypress.yml

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,48 @@
1-
name: cypress tests
1+
name: Cypress UI tests
22

33
on:
44
push:
5-
branches-ignore:
6-
- 'release-please-**'
75

86
jobs:
97
cypress-run:
108
concurrency: cypress-${{ github.head_ref || github.ref }}
119
runs-on: ubuntu-latest
1210
steps:
13-
- name: checkout
14-
uses: actions/checkout@v3
15-
16-
- name: set up node
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: '16'
11+
- name: Checkout
12+
uses: actions/checkout@v4
2013

2114
- name: Yarn Install and Cache
2215
uses: graasp/graasp-deploy/.github/actions/yarn-install-and-cache@v1
2316
with:
2417
cypress: true
2518

26-
- name: cypress run
19+
- name: Build App
20+
run: yarn build:test
21+
shell: bash
22+
env:
23+
VITE_PORT: 3000
24+
VITE_API_HOST: http://localhost:3636
25+
VITE_GRAASP_APP_KEY: id-1234567890
26+
VITE_ENABLE_MOCK_API: true
27+
VITE_VERSION: cypress-tests
28+
29+
- name: Cypress Run
2730
uses: cypress-io/github-action@v5
2831
env:
2932
VITE_PORT: 3000
3033
VITE_API_HOST: http://localhost:3636
31-
VITE_GRAASP_APP_ID: id-1234567890
32-
VITE_MOCK_API: true
34+
VITE_GRAASP_APP_KEY: id-1234567890
35+
VITE_ENABLE_MOCK_API: true
3336
VITE_VERSION: cypress-tests
34-
VITE_WS_HOST: ws://localhost:3636/ws
3537
with:
3638
install: false
37-
build: yarn build
3839
config: baseUrl=http://localhost:3000
39-
start: yarn dev
40+
start: yarn preview:test
4041
browser: chrome
4142
quiet: true
4243
# point to new cypress@10 config file
4344
config-file: cypress.config.ts
4445

45-
# - name: Run Component tests 🧪
46-
# uses: cypress-io/github-action@v5
47-
# with:
48-
# # we have already installed everything
49-
# install: false
50-
# # to run component tests we need to use "component: true"
51-
# component: true
52-
5346
- uses: actions/upload-artifact@v3
5447
if: failure()
5548
with:

.github/workflows/release-please.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,15 @@ jobs:
99
release-please:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: google-github-actions/release-please-action@v3
12+
- uses: google-github-actions/release-please-action@v4
1313
id: release
1414
with:
1515
release-type: node
16-
package-name: graasp-app-brainwriting
17-
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"docs","section":"Documentation","hidden":false},{"type":"test","section":"Tests","hidden":false}]'
1816

19-
- uses: actions/checkout@v3
20-
with:
21-
ref: main
22-
23-
- name: Tag major and minor versions
24-
uses: jacobsvante/[email protected]
25-
if: ${{ steps.release.outputs.releases_created }}
26-
with:
27-
major: ${{ steps.release.outputs.major }}
28-
minor: ${{ steps.release.outputs.minor }}
17+
- uses: actions/checkout@v4
2918

3019
- name: Set tag
31-
if: ${{ steps.release.outputs.releases_created }}
20+
if: ${{ steps.release.outputs.releases_created == 'true' }}
3221
id: set-tag
3322
run: |
3423
REPOSITORY=$(echo '${{ github.repository }}')
@@ -38,7 +27,7 @@ jobs:
3827
3928
# Trigger an 'on: repository_dispatch' workflow to run in graasp-deploy repository
4029
- name: Push tag to Graasp Deploy (Staging)
41-
if: ${{ steps.release.outputs.releases_created }}
30+
if: ${{ steps.release.outputs.releases_created == 'true' }}
4231
uses: peter-evans/repository-dispatch@v2
4332
with:
4433
token: ${{ secrets.REPO_ACCESS_TOKEN }}

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 0 additions & 546 deletions
This file was deleted.

.yarn/releases/yarn-3.6.3.cjs

Lines changed: 0 additions & 874 deletions
This file was deleted.

.yarn/releases/yarn-4.0.2.cjs

Lines changed: 893 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
nodeLinker: node-modules
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
24

3-
plugins:
4-
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
5-
spec: '@yarnpkg/plugin-interactive-tools'
5+
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-3.6.3.cjs
7+
yarnPath: .yarn/releases/yarn-4.0.2.cjs

README.md

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1-
# Graasp App: brainwriting
1+
# Graasp App: collaborative ideation
2+
3+
![GitHub release (with filter)](https://img.shields.io/github/v/release/graasp/graasp-app-collaborative-ideation)
4+
5+
![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/graasp/graasp-app-collaborative-ideation/deploy-dev.yml?label=development)
6+
![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/graasp/graasp-app-collaborative-ideation/deploy-stage.yml?label=staging)
7+
![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/graasp/graasp-app-collaborative-ideation/deploy-prod.yml?label=production)
28

39
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
10+
11+
# Development
12+
13+
## Installation
14+
15+
Clone this repository.
16+
17+
## Running the app
18+
19+
Create a `.env.development` file with the following content:
20+
21+
```bash
22+
VITE_PORT=3333
23+
VITE_API_HOST=http://localhost:3000
24+
VITE_ENABLE_MOCK_API=false
25+
VITE_GRAASP_APP_KEY=02052cf4-cc45-45c6-b0b8-61102244ed11
26+
VITE_VERSION=latest
27+
VITE_WS_HOST=ws://localhost:3000/ws
28+
```
29+
30+
## Running the tests
31+
32+
Create a `.env.test` file with the following content:
33+
34+
```bash
35+
VITE_PORT=3333
36+
VITE_API_HOST=http://localhost:3636
37+
VITE_ENABLE_MOCK_API=true
38+
VITE_GRAASP_APP_KEY=45678-677889
39+
VITE_VERSION=latest
40+
41+
# dont open browser
42+
BROWSER=none
43+
```

commitlint.config.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

commitlint.config.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import type { UserConfig } from '@commitlint/types';
2+
3+
const Configuration: UserConfig = {
4+
/*
5+
* Resolve and load @commitlint/config-conventional from node_modules.
6+
* Referenced packages must be installed
7+
*/
8+
extends: ['@commitlint/config-conventional'],
9+
/*
10+
* Resolve and load @commitlint/format from node_modules.
11+
* Referenced package must be installed
12+
*/
13+
formatter: '@commitlint/format',
14+
};
15+
16+
module.exports = Configuration;

0 commit comments

Comments
 (0)