Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
592e0bf
Merge pull request #2 from polyglot-edu/integration-for-workadventure
antbucc May 2, 2024
2d6b6f8
Merge pull request #3 from polyglot-edu/integration-for-workadventure
tmaog May 8, 2024
cc3adad
Merge pull request #4 from polyglot-edu/integration-for-workadventure
tmaog May 8, 2024
737ef93
Merge pull request #5 from polyglot-edu/integration-for-workadventure
tmaog May 8, 2024
6a1ab13
Merge pull request #6 from polyglot-edu/integration-for-workadventure
tmaog May 20, 2024
208ac65
Merge pull request #7 from polyglot-edu/integration-for-workadventure
tmaog May 30, 2024
36ceb38
Merge pull request #8 from polyglot-edu/integration-for-workadventure
tmaog May 30, 2024
e0e2f75
Merge pull request #9 from polyglot-edu/integration-for-workadventure
tmaog Jul 22, 2024
fff8893
new setup for webapp
tmaog Jul 23, 2024
1f3f3a7
full tools refactoring
tmaog Jul 24, 2024
cb35e06
progress in refactoring
tmaog Jul 26, 2024
7420c0d
fix error
tmaog Jul 26, 2024
65af45b
fix: prettier
tmaog Sep 3, 2024
dc9347a
fix validation multichoice question
tmaog Sep 3, 2024
1449ba4
text fix
tmaog Sep 3, 2024
75ae4f0
fix: refactoring and adding new pages
tmaog Sep 9, 2024
37cc923
fix: comment removed
tmaog Sep 9, 2024
33a9fc4
Merge pull request #11 from polyglot-edu/refactoring
tmaog Sep 9, 2024
d6fc379
bug fix
tmaog Sep 9, 2024
9f8ec1f
Merge pull request #12 from polyglot-edu/refactoring
tmaog Sep 9, 2024
5cbd50f
fix: text upgrade
tmaog Sep 11, 2024
6c55449
Merge pull request #13 from polyglot-edu/refactoring
tmaog Sep 12, 2024
a23734d
Update deploy-prod.yml
daviFrag Sep 13, 2024
ce31795
remove probes and set node encore-1 as preferential
daviFrag Sep 13, 2024
c06c563
bug fix wa
tmaog Sep 13, 2024
fbffd6a
bugfix edgesId selection
tmaog Sep 13, 2024
28d7138
Merge pull request #14 from polyglot-edu/refactoring
tmaog Sep 13, 2024
9b0805d
lp list filter
tmaog Sep 16, 2024
50becbb
Merge pull request #15 from polyglot-edu/refactoring
tmaog Sep 16, 2024
4d4b9c0
platform != webapp fix
tmaog Sep 17, 2024
009bcc3
Merge pull request #16 from polyglot-edu/refactoring
tmaog Sep 17, 2024
6dc69f8
hidden fix
tmaog Sep 17, 2024
6f72bde
Merge pull request #17 from polyglot-edu/refactoring
tmaog Sep 17, 2024
b75978c
button remove selection LP
tmaog Sep 23, 2024
02bbaf5
prettier
tmaog Oct 19, 2024
b49ae19
feat: package-lock update
RikiStiz Oct 26, 2024
a7dcd35
feat: new activity interface
RikiStiz Oct 26, 2024
1d2ce9e
fix: box view
RikiStiz Oct 26, 2024
1b477d6
feat: better link
RikiStiz Oct 27, 2024
0429af2
feat: new true false interface
RikiStiz Oct 28, 2024
aaa43ef
fix: link new tab and btn next
RikiStiz Oct 29, 2024
3c7f885
fix: btn hidden (true false)
RikiStiz Oct 29, 2024
3a2a1a8
fix: link (read material)
RikiStiz Oct 29, 2024
2efbcf5
feat: iframe yt
RikiStiz Oct 30, 2024
de6e611
feat: show correct answer (closeEnded)
RikiStiz Oct 30, 2024
9e3c55b
fix: index error page interface
RikiStiz Oct 30, 2024
20772bd
fix: prietter
tmaog Oct 31, 2024
fda883e
Merge branch 'main' into improve-new-tools
tmaog Oct 31, 2024
9e149b3
Merge pull request #19 from polyglot-edu/improve-new-tools
tmaog Oct 31, 2024
cf43207
feat: create openQuestion page
RikiStiz Nov 6, 2024
181909b
feat: test readmaterial pdf download
RikiStiz Nov 19, 2024
ea2c81c
Merge branch 'improve-new-tools' of https://github.com/polyglot-edu/W…
RikiStiz Nov 19, 2024
f7f3c8d
fix: remove outdated usage
tmaog Nov 19, 2024
770b927
feat: openQuestion corrector
RikiStiz Nov 20, 2024
f26a4d6
Merge branch 'improve-new-tools' of https://github.com/polyglot-edu/W…
RikiStiz Nov 20, 2024
9aed124
feat: PDF view
RikiStiz Nov 26, 2024
03fe9a3
fix: api headers
RikiStiz Nov 26, 2024
fed0b02
fix: flow list removed
tmaog Nov 27, 2024
f1a6318
Merge pull request #21 from polyglot-edu/upgrade-interface-LP
tmaog Nov 27, 2024
f22560d
fix: console error 304
RikiStiz Nov 27, 2024
31371c0
Merge pull request #22 from polyglot-edu/improve-new-tools
tmaog Nov 27, 2024
c5868fc
fix: link youtube
RikiStiz Nov 28, 2024
fa8fdee
Merge branch 'main' of https://github.com/polyglot-edu/Webapp
RikiStiz Nov 28, 2024
7186a54
Merge pull request #23 from polyglot-edu/main
tmaog Nov 29, 2024
37b4a9a
bug fix
tmaog Dec 2, 2024
72d049b
Merge pull request #24 from polyglot-edu/upgrade-interface-LP
tmaog Dec 2, 2024
f013adc
fix
tmaog Dec 2, 2024
8a0f3b7
clear
tmaog Dec 2, 2024
85494a4
Merge pull request #25 from polyglot-edu/upgrade-interface-LP
tmaog Dec 2, 2024
000373d
flowShower improved
tmaog Dec 2, 2024
461ac07
Merge pull request #26 from polyglot-edu/upgrade-interface-LP
tmaog Dec 2, 2024
a867fd5
feat: New component
tmaog Dec 3, 2024
5079810
fix: setup
tmaog Dec 3, 2024
da3f34c
feat: summary tool
RikiStiz Dec 3, 2024
5b0cb85
fix: markdown implementation in flexText component + prettier
tmaog Dec 3, 2024
d469914
merged
tmaog Dec 3, 2024
c653c09
prettier
tmaog Dec 3, 2024
7326f05
fix
tmaog Dec 3, 2024
6f686b3
justify fix
tmaog Dec 3, 2024
ac18670
box refactor
tmaog Dec 3, 2024
83c6608
fix: clean yt ink parameters
RikiStiz Dec 3, 2024
97851f3
Merge pull request #27 from polyglot-edu/improve-new-tools
tmaog Dec 3, 2024
fb5ab7b
feat: new flowMenu interface
RikiStiz Dec 6, 2024
dd38f38
feat: disable btn if there is no activity
RikiStiz Dec 6, 2024
ae29658
fix: openQuestion graphic
tmaog Dec 6, 2024
e82665f
feat: nodes reorder based on execution
tmaog Dec 6, 2024
77d2b17
fix: trueFalse correction
RikiStiz Dec 6, 2024
9f4acbe
fix: scroll readMaterial
RikiStiz Dec 6, 2024
a2a3031
fix: text area
RikiStiz Dec 9, 2024
b440c96
Fix: markdown alignment
RikiStiz Dec 9, 2024
a1e4ca4
Feat: activities list
RikiStiz Dec 14, 2024
1551f6a
feat: icons setup
tmaog Dec 14, 2024
4bf2688
fix images
tmaog Dec 14, 2024
59d604f
test
tmaog Dec 14, 2024
f033eee
fix
tmaog Dec 14, 2024
ddf1f32
algoritm and list fix
tmaog Dec 14, 2024
a0dc35f
fix: add img for implemented activities
RikiStiz Dec 17, 2024
b0f890e
fix: icon view
RikiStiz Dec 17, 2024
84af7ee
fix: activities list
RikiStiz Dec 17, 2024
fe82cc7
fix: load flow activities
RikiStiz Dec 17, 2024
0f5b297
fix: multi line title activities
RikiStiz Dec 17, 2024
b081ac3
Merge branch 'main' into improve-new-tools
tmaog Dec 17, 2024
99d42e2
Merge pull request #28 from polyglot-edu/improve-new-tools
tmaog Dec 17, 2024
af1dfb4
fix: merge bug
tmaog Dec 17, 2024
1a68c1d
fix: fix commit
RikiStiz Dec 18, 2024
f28f9b5
Merge branch 'main' into improve-new-tools
tmaog Dec 18, 2024
1db2a69
Merge pull request #30 from polyglot-edu/improve-new-tools
tmaog Dec 18, 2024
a2be06e
feat: search bar and selected flow
RikiStiz Dec 20, 2024
c7ffdac
feat: tag filter
RikiStiz Jan 2, 2025
55ddb8a
fix: filter
RikiStiz Jan 3, 2025
d77eba5
fix: prettier
tmaog Jan 9, 2025
373da3f
Merge pull request #31 from polyglot-edu/improve-new-tools
tmaog Jan 9, 2025
a782b4d
feat: LP grade and executions
RikiStiz Jan 15, 2025
a6a355a
Merge pull request #32 from polyglot-edu/improve-new-tools
tmaog Jan 15, 2025
edc93ce
flowList for eventAquila
tmaog Feb 12, 2025
69fc31f
derivate remove
tmaog Feb 17, 2025
25391ab
activeFlow to chosenFlow for redundancy
tmaog Feb 18, 2025
b86ac57
fix selectedFlow
tmaog Feb 18, 2025
5d00d40
fix
tmaog Feb 18, 2025
b20ae51
removeChild commented
tmaog Feb 18, 2025
4aba5ed
fix
tmaog Feb 18, 2025
0d5ef00
Merge pull request #33 from polyglot-edu/main
tmaog Mar 27, 2025
2d9c9f4
setup for analytics actions interaction
tmaog Apr 1, 2025
26fd610
feat: numberDisplay UI
tmaog Apr 8, 2025
3466079
feat: creation of open-close tool action and open - close node action
tmaog Apr 8, 2025
7b48854
setup
tmaog Apr 8, 2025
6fa0b4b
fix: error cases
tmaog Apr 9, 2025
372aa62
Merge branch 'WorkAdventureXPolyGloT-new-UI-gamified' into merge-bran…
tmaog Apr 9, 2025
46cd71f
Merge pull request #34 from polyglot-edu/merge-branch-error
tmaog Apr 9, 2025
7a3f0f5
feat: action creation for tools and pages interaction
tmaog Apr 10, 2025
eb4a931
Merge pull request #35 from polyglot-edu/WorkAdventureXPolyGloT-new-U…
tmaog Apr 10, 2025
4a233d5
name fix
tmaog Apr 10, 2025
7b36734
action fix
tmaog Apr 13, 2025
e35717a
Merge pull request #36 from polyglot-edu/WorkAdventureXPolyGloT-new-U…
tmaog Apr 13, 2025
352ffcf
integration submit action
tmaog Apr 15, 2025
36e6b36
bug fix register action api
tmaog Apr 15, 2025
7aaa7e6
submit action integrated missing truefalse bug
tmaog Apr 15, 2025
8b17270
playerId to uuid
tmaog Apr 16, 2025
98bdfea
Merge branch 'main' into WorkAdventureXPolyGloT-new-UI-gamified
tmaog Apr 16, 2025
ffeed62
Merge pull request #37 from polyglot-edu/WorkAdventureXPolyGloT-new-U…
tmaog Apr 16, 2025
ae6dcbd
action api errors managed
tmaog Apr 16, 2025
8ba36f8
Merge pull request #38 from polyglot-edu/WorkAdventureXPolyGloT-new-U…
tmaog Apr 16, 2025
8ef47b7
Update deploy-prod.yml
tmaog Apr 16, 2025
85867b3
update deploy
tmaog Apr 16, 2025
eead0e6
update deploy
tmaog Apr 16, 2025
186ac0d
update deploy
tmaog Apr 16, 2025
2bc282f
update deploy
tmaog Apr 16, 2025
7499b46
restore deploy prod
tmaog Apr 16, 2025
2acb115
Merge pull request #39 from polyglot-edu/main
tmaog May 13, 2025
966484d
fix: message improve
tmaog May 13, 2025
1562702
fix: message improve
tmaog May 13, 2025
a8ae865
function name fix
tmaog May 13, 2025
876f6c3
function name fix
tmaog May 13, 2025
7ac6dfd
ai data update
tmaog May 20, 2025
55b5feb
file remove and abstract data definition
tmaog May 20, 2025
0843c8b
new api
tmaog May 20, 2025
65b7d06
library tool (abstract node execution)
tmaog May 20, 2025
a0e7bcf
tools page update
tmaog May 20, 2025
695e566
fix: redundant prop remove
tmaog May 21, 2025
38bc904
feat: execution progress for abstractNode
tmaog May 21, 2025
2225bf6
fix: redundant consolelog remove
tmaog May 21, 2025
4a1ca7e
fix: execution abstractNode
tmaog May 21, 2025
5a0634d
Merge pull request #40 from polyglot-edu/improve-new-tools
tmaog May 21, 2025
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
7 changes: 4 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
Dockerfile
build
charts
.next
dist
.env.local
Dockerfile
127 changes: 127 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
kind: pipeline
type: docker
name: Node-Editor

globals:
- &docker_creds
username:
from_secret: docker_username
password:
from_secret: docker_password
- &env
AUTH0_SECRET: secret
AUTH0_ISSUER_BASE_URL: url
AUTH0_CLIENT_ID: client_id
AUTH0_CLIENT_SECRET: client_secret
AUTH0_AUDIENCE: https://api.polyglot-edu.com
AUTH0_SCOPE: 'openid profile email read:products'
DEPLOY_URL: polyglot-edu.com
BACK_URL: https://polyglot-api.polyglot-edu.com
TEST_MODE: true
- &condition
event:
- push

steps:
- name: Build and push image to Docker # building the encore docker image
image: plugins/docker
settings:
repo: docker.polyglot-edu.com/polyglot-edu/node-editor # must be lowercase
registry: docker.polyglot-edu.com
dockerfile: ./Dockerfile
tags: ['${DRONE_BRANCH}']
build_args:
- 'DEPLOY_URL=polyglot-edu.com'
- 'BACK_URL=https://polyglot-api.polyglot-edu.com'
- 'TEST_MODE=true'
<<: *docker_creds
when:
<<: *condition
- name: Deploy Production # deploy to kubernetes using a Helm chart
image: pelotech/drone-helm3
environment:
CFORIGIN:
from_secret: cf_origin
DOCKERCONFIG:
from_secret: dockerconfigjson
<<: *env
settings:
mode: upgrade
chart: ./charts
release: node-editor-${DRONE_BRANCH}
namespace: node-editor-${DRONE_BRANCH}
debug: true
kube_service_account: admin-user
kube_api_server: 'https://131.114.23.149:6443'
kube_token:
from_secret: kube_token
values:
- 'url=polyglot-edu.com'
- 'cfOriginKey=$CFORIGIN'
- 'dockerconfigjson=$DOCKERCONFIG'
- 'image.repository=docker.polyglot-edu.com/polyglot-edu/node-editor'
- 'image.tag=${DRONE_BRANCH}'
- 'env.authSecret=$AUTH0_SECRET'
- 'env.authIssuerUrl=$AUTH0_ISSUER_BASE_URL'
- 'env.authClientId=$AUTH0_CLIENT_ID'
- 'env.authClientSecret=$AUTH0_CLIENT_SECRET'
- 'env.authAudience=$AUTH0_AUDIENCE'
- 'env.authScope=$AUTH0_SCOPE'
- 'env.backUrl=$BACK_URL'
- 'env.testMode=$TEST_MODE'
cleanup_failed_upgrade: true
force_upgrade: true
skip_tls_verify: true
create_namespace: true
depends_on:
- Build and push image to Docker
when:
<<: *condition
branch:
include:
- dev #remove it later
- main
- name: Deploy Development # deploy to kubernetes using a Helm chart
image: pelotech/drone-helm3
environment:
CFORIGIN:
from_secret: cf_origin
DOCKERCONFIG:
from_secret: dockerconfigjson
<<: *env
settings:
mode: upgrade
chart: ./charts
release: node-editor-${DRONE_BRANCH}
namespace: node-editor-${DRONE_BRANCH}
debug: true
kube_service_account: admin-user
kube_api_server: 'https://131.114.23.149:6443'
kube_token:
from_secret: kube_token
values:
- 'url=${DRONE_BRANCH}-dashboard.polyglot-edu.com'
- 'cfOriginKey=$CFORIGIN'
- 'dockerconfigjson=$DOCKERCONFIG'
- 'image.repository=docker.polyglot-edu.com/polyglot-edu/node-editor'
- 'image.tag=${DRONE_BRANCH}'
- 'env.authSecret=$AUTH0_SECRET'
- 'env.authIssuerUrl=$AUTH0_ISSUER_BASE_URL'
- 'env.authClientId=$AUTH0_CLIENT_ID'
- 'env.authClientSecret=$AUTH0_CLIENT_SECRET'
- 'env.authAudience=$AUTH0_AUDIENCE'
- 'env.authScope=$AUTH0_SCOPE'
- 'env.backUrl=$BACK_URL'
- 'env.testMode=$TEST_MODE'
cleanup_failed_upgrade: true
force_upgrade: true
skip_tls_verify: true
create_namespace: true
depends_on:
- Build and push image to Docker
when:
<<: *condition
branch:
exclude:
- dev #remove it later
- main
32 changes: 32 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"extends": [
"next",
"next/core-web-vitals",
"plugin:@typescript-eslint/recommended",
"plugin:storybook/recommended"
],
"globals": {
"React": "readonly"
},
"overrides": [
{
"files": ["*.stories.@(ts|tsx|js|jsx|mjs|cjs)"],
"rules": {
// example of overriding a rule
"storybook/hierarchy-separator": "error"
}
}
],
"rules": {
"@typescript-eslint/no-unused-vars": "warn",
"@typescript-eslint/ban-types": [
"error",
{
"extendDefaults": true,
"types": {
"{}": false
}
}
]
}
}
10 changes: 10 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
"DEPLOY_URL=https://polyglot-webapp.polyglot-edu.com"
"BACK_URL=https://polyglot-api-staging.polyglot-edu.com"
"TEST_MODE=true"
"AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}"
"AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}"
"AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}"
"AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}"
"AUTH0_AUDIENCE=${{ secrets.AUTH0_AUDIENCE }}"
"AUTH0_SCOPE=${{ secrets.AUTH0_SCOPE }}"
- name: Push to ghcr.io with retries
uses: nick-invision/retry@v2
with:
Expand Down
21 changes: 17 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,29 @@
# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
5 changes: 2 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.yarn
.build
.next
dist
node_modules
charts
.github
.public
.github
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"organizeImportsSkipDestructiveCodeActions": true,
"endOfLine": "crlf"
}
29 changes: 24 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
FROM node:21-alpine

ARG TEST_MODE=false
ARG DEPLOY_URL=https://staging.polyglot-edu.com
ARG BACK_URL=https://polyglot-api-staging.polyglot-edu.com
ARG AUTH0_SECRET
ARG AUTH0_AUDIENCE
ARG AUTH0_SCOPE
ARG AUTH0_CLIENT_ID
ARG AUTH0_CLIENT_SECRET
ARG AUTH0_ISSUER_BASE_URL


ARG WORKDIR=web-client

WORKDIR $WORKDIR

COPY package.json .
COPY package-lock.json .

RUN npm install -g serve
COPY tsconfig.json .

RUN npm install

COPY . .

RUN npm run build

CMD serve -s build
RUN export DEPLOY_URL=${DEPLOY_URL} && \
export TEST_MODE=${TEST_MODE} && \
export BACK_URL=${BACK_URL} && \
export AUTH0_SECRET=${AUTH0_SECRET} && \
export AUTH0_ISSUER_BASE_URL=${AUTH0_ISSUER_BASE_URL} && \
export AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID} && \
export AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET} && \
export AUTH0_AUDIENCE=${AUTH0_AUDIENCE} && \
export AUTH0_SCOPE=${AUTH0_SCOPE} && \
npm run build

CMD npm run start
21 changes: 21 additions & 0 deletions License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 PolyGlot-Edu

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading
Loading