Skip to content

update dependencies, also add missing localized messages #108

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

Merged
merged 15 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 0 additions & 31 deletions .github/workflows/build.yml

This file was deleted.

27 changes: 16 additions & 11 deletions .github/workflows/build_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 22.x
cache: 'npm'
- name: Docker login
run: docker login ghcr.io -u previ -p ${{ secrets.GHCR_BACKEND_STUB_RO }}
- name: Run stub
run: docker run -dp 5000:5000 --name backend-stub ghcr.io/coderbotorg/backend:stub-latest
# Install NPM dependencies, cache them correctly
# and run all Cypress tests
- name: Cypress run
uses: cypress-io/github-action@v4
uses: cypress-io/github-action@v6
with:
#build: npm run build-test
start: npm run test
Expand All @@ -36,7 +41,7 @@ jobs:
- name: Clean up
run: docker stop backend-stub && docker rm backend-stub
- name: Archive coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage
path: coverage
Expand All @@ -45,16 +50,16 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
- name: Use Node.js 16.x
uses: actions/setup-node@v3
- uses: actions/checkout@v4
- name: Use Node.js 22.x
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 22.x
cache: 'npm'
- run: npm ci
- run: npm run build --if-present
- name: Archive dist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand Down Expand Up @@ -93,7 +98,7 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v3 # Checking out the repo
- uses: actions/checkout@v4 # Checking out the repo
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand All @@ -113,7 +118,7 @@ jobs:
# push event
type=sha,enable=true,prefix=git-,format=short
- name: Download dist artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand All @@ -133,7 +138,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
push: true
platforms: linux/arm/v7
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Create GitHub Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create Release
Expand All @@ -36,19 +36,19 @@ jobs:
needs: [release]
strategy:
matrix:
node-version: [16.x]
node-version: [22.x]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npm run build --if-present

- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: info

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
needs: [build]
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v1
- uses: actions/download-artifact@v4
with:
name: info
- name: Set publish_info
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/300_activities.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('activities page', () => {
cy.get('#button_index_2').find('button.remove').click()
cy.get('#button_index_1').find('button.remove').click()
cy.get('button#toolbox').click()
cy.get('.blockly-toolbox-editor').find('#blockly-9').click()
cy.get('.blockly-toolbox-editor').find('#blockly-g').click()
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
cy.get('button#activity_save').click()
cy.visit('http://localhost:8080')
Expand Down Expand Up @@ -141,7 +141,7 @@ describe('activities page', () => {
cy.get('#card_font_ui').find('input[value*="opensans"]').click()
cy.get('#card_font_editor').find('input[value*="robotomono"]').click()
cy.get('button#toolbox').click()
cy.get('.blockly-toolbox-editor').find('#blockly-3').click()
cy.get('.blockly-toolbox-editor').find('#blockly-g').click()
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
cy.get('button#activity_save').click()
cy.visit('http://localhost:8080')
Expand Down Expand Up @@ -179,7 +179,7 @@ describe('activities page', () => {
cy.get('input#category_name').type("Test category")
cy.get('button#save_category').click()
cy.get('.v-list-item-title').contains('Test category').click({ force: true })
cy.get('.blockly-toolbox-editor').find('#blockly-1').click({ force: true })
cy.get('.blockly-toolbox-editor').find('#blockly-g').click({ force: true })
cy.get('.blocklyDraggable').click({ force: true, multiple: true })
cy.get('button#activity_save').click()
cy.visit('http://localhost:8080')
Expand Down
25 changes: 24 additions & 1 deletion cypress/e2e/500_control.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ describe('load control page, verify stream is there', () => {
cy.get('a.v-list-item[href*="control"]').click()
cy.get('#app').click()
cy.get('button.photo').click()
cy.visit('http://localhost:8080')
cy.get('.v-carousel').should('exist')
cy.get('button.v-app-bar-nav-icon').should('exist').click()
cy.get('a.v-list-item[href*="gallery"]').click()
cy.get('#app').click()
cy.get('.gallery').contains('DSC1').should('exist')
cy.get('.v-main').contains('DSC1').click()
cy.get('.v-card-title.details').contains('DSC1').should('exist')
cy.get('.v-card-title.details').contains('DSC1').parents('.v-card').find('button.ok').click()
cy.get('.v-main').contains('DSC1').parents('.v-card').find('.mdi-delete').click()
cy.get('#gallery_photo_confirm_card').find('.ok').click()
})

it('record a video', () => {
Expand All @@ -37,6 +48,18 @@ describe('load control page, verify stream is there', () => {
cy.get('button.video').click()
cy.wait(5000)
cy.get('button.video').click()
cy.visit('http://localhost:8080')
cy.get('.v-carousel').should('exist')
cy.get('button.v-app-bar-nav-icon').should('exist').click()
cy.get('a.v-list-item[href*="gallery"]').click()
cy.get('#app').click()
cy.get('.gallery').contains('VID1').should('exist')
cy.get('.v-main').contains('VID1').click()
cy.get('.v-card-title.details').contains('VID1').should('exist')
cy.get('.v-card-title.details').contains('VID1').parents('.v-card').find('button.ok').click()
cy.get('.v-main').contains('VID1').parents('.v-card').find('.mdi-delete').click()
cy.get('#gallery_photo_confirm_card').find('.ok').click()

})
/*
it('say a phrase', () => {
Expand All @@ -59,5 +82,5 @@ describe('load control page, verify stream is there', () => {
cy.get('a.gallery').click()
cy.url().should('include', '/gallery')
})
*/
*/
})
29 changes: 16 additions & 13 deletions cypress/e2e/700_settings.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,32 @@ describe('load homepage', () => {
cy.intercept('http://localhost:5000/wifi/v1/list_access_points', (req) => {
req.reply({"ssids": [{"ssid": "wifi-home", "conn_type": "WPA2", "strength": 99}]})
})
cy.visit('http://localhost:8080')
cy.visit('localhost:8080')
cy.wait(1000)
cy.get('.v-carousel').should('exist')
cy.get('button.v-app-bar-nav-icon').should('exist').click()
cy.get('a.v-list-item[href*="/settings"]').click()
cy.get('#app').click()
cy.get('button#1').click()
cy.get('input#settings_movement_control_forward_speed').clear().type('90')
cy.get('input#settings_movement_control_forward_elapse').clear().type('1')
cy.get('input#settings_movement_control_turn_speed').clear().type('90')
cy.get('input#settings_movement_control_turn_elapse').clear().type('1')
cy.get('input#settings_movement_program_forward_speed').clear().type('90')
cy.get('input#settings_movement_program_forward_elapse').clear().type('1')
cy.get('input#settings_movement_program_turn_speed').clear().type('90')
cy.get('input#settings_movement_program_turn_elapse').clear().type('1')
cy.get('#save').click()
cy.wait(1000)
cy.get('input#settings_movement_control_forward_speed').type('{selectAll}90')
cy.get('input#settings_movement_control_forward_elapse').type('{selectAll}1')
cy.get('input#settings_movement_control_turn_speed').type('{selectAll}90')
cy.get('input#settings_movement_control_turn_elapse').type('{selectAll}1')
cy.get('input#settings_movement_program_forward_speed').type('{selectAll}90')
cy.get('input#settings_movement_program_forward_elapse').type('{selectAll}1')
cy.get('input#settings_movement_program_turn_speed').type('{selectAll}90')
cy.get('input#settings_movement_program_turn_elapse').type('{selectAll}1')
cy.get('button#save').click()
cy.get('#snackId').should('exist')
cy.visit('http://localhost:8080')
cy.get('.v-carousel').should('exist')
cy.get('button.v-app-bar-nav-icon').should('exist').click()
cy.get('a.v-list-item[href*="/settings"]').click()
cy.get('#app').click()
cy.get('button#1').click()
//cy.get('input#settings_movement_control_forward_speed').should('have.value', '90')
//cy.get('input#settings_movement_control_forward_elapse').should('have.value', '1')
cy.get('input#settings_movement_control_forward_speed').should('have.value', '90')
cy.get('input#settings_movement_control_forward_elapse').should('have.value', '1')
cy.get('input#settings_movement_control_turn_speed').should('have.value', '90')
cy.get('input#settings_movement_control_turn_elapse').should('have.value', '1')
cy.get('input#settings_movement_program_forward_speed').should('have.value', '90')
Expand Down Expand Up @@ -131,4 +134,4 @@ describe('load homepage', () => {
cy.get('a.v-list-item[href*="/control"]').click()
cy.get('#confirm_exit_dialog').should('exist')
})
})
})
Loading
Loading