Skip to content
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

Hackweek/webapp builder #358

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
67e0a3e
fix: e2e test for payment types
darkoatanasovski Jul 5, 2023
50536cf
feat(project): init export webapp workflow
darkoatanasovski Aug 7, 2023
15b6028
Merge branch 'develop' into hackweek/webapp-builder
darkoatanasovski Aug 7, 2023
39521a6
chore: testing export wf
darkoatanasovski Aug 7, 2023
505f073
chore: testing export wf
darkoatanasovski Aug 7, 2023
02273a8
feat(project): improved appbuilder component handling
darkoatanasovski Aug 8, 2023
1f87ce6
fix(project): added route in vite config
darkoatanasovski Aug 8, 2023
b13d17a
chore(project): temporary disabled workflows
darkoatanasovski Aug 8, 2023
76204cc
chore(project): enable only export workflow
darkoatanasovski Aug 8, 2023
b49e02f
chore(project): dynamic import path
darkoatanasovski Aug 8, 2023
04db9d1
chore(project): added tag for workflow dispatch
darkoatanasovski Aug 8, 2023
5d3a326
chore(project): added tag for workflow dispatch
darkoatanasovski Aug 8, 2023
25c1249
chore(project): improved handling plugins
darkoatanasovski Aug 8, 2023
80d6e95
feat: initial webapp shop implementation
naumovski-filip Aug 8, 2023
33c5e1b
feat: add image preview and multiple prices support
naumovski-filip Aug 8, 2023
14e1a71
feat: product preview improvements
naumovski-filip Aug 8, 2023
6093ca3
chore(project): cache node_modules
darkoatanasovski Aug 9, 2023
c58b7f3
chore(project): fixed typo in export workflow
darkoatanasovski Aug 9, 2023
8a17247
chore(project): fixed typo in export workflow
darkoatanasovski Aug 9, 2023
8503b6d
chore(project): improved caching for export
darkoatanasovski Aug 9, 2023
4ba6f6b
chore(project): improved caching for export
darkoatanasovski Aug 9, 2023
4f29355
chore(project): improved caching for export
darkoatanasovski Aug 9, 2023
da69f94
chore(project): improved caching for export
darkoatanasovski Aug 9, 2023
488097a
feat: update success modal, add config check
naumovski-filip Aug 10, 2023
e448a40
Merge branch 'hackweek/webapp-builder' into hw/webapp-shop
naumovski-filip Aug 12, 2023
224816e
fix: fix welcome modal message
naumovski-filip Aug 12, 2023
76eb941
Merge pull request #361 from jwplayer/hw/webapp-shop
darkoatanasovski Aug 13, 2023
e49b713
chore: overlay component update
kiremitrov123 Aug 13, 2023
4c8b0af
chore: merges
kiremitrov123 Aug 13, 2023
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
1 change: 1 addition & 0 deletions .depcheckrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ignores: [
'\#types',
'\#components',
'\#utils',
'\#plugins',
# This is used in src/styles, which recognizes absolute paths from the repo root
'src',
# To support e2e-reports
Expand Down
4 changes: 3 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ APP_PLAYER_ID=M4qoGvUk
APP_DEFAULT_LANGUAGE=en

# a comma separated list of languages that are enabled (this only works for languages that are enabled in the app)
APP_ENABLED_LANGUAGES=en,es
APP_ENABLED_LANGUAGES=en,es

APP_BUILDER_COMPONENT="./plugins/appbuilder/AppBuilder"
38 changes: 38 additions & 0 deletions .github/workflows/codeceptjs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: CodeceptJS

on: [workflow_dispatch]

jobs:
build:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
node-version: [18.x]
config: [desktop, mobile]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: |
yarn
yarn global add wait-on
- name: Start preview server
run: yarn start:test &
- name: Run tests
run: wait-on -v -t 60000 -c ./scripts/waitOnConfig.js http-get://localhost:8080 && yarn codecept:${{ matrix.config }}
env:
TEST_RETRY_COUNT: 2
WORKER_COUNT: 2
- name: Uploading artifact
if: always()
uses: actions/upload-artifact@v3
with:
name: allure-report-${{ matrix.config }}
path: ./test-e2e/output/${{ matrix.config }}
retention-days: 7
54 changes: 54 additions & 0 deletions .github/workflows/export.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Export WebApp [ Hackweek ]

on:
workflow_dispatch:
inputs:
tag:
type: input
description: 'unique tag'

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Cache Build Artifacts
if: ${{ steps.check-cache.outputs.cache-exists != 'true' }}
uses: actions/cache@v2
with:
path: build
key: ${{ runner.os }}-build

- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 18.x

- name: Check Build Cache
id: check-cache
run: echo "cache-exists=$(test -d build && echo true || echo false)" >> $GITHUB_OUTPUT

- name: Build WebApp
if: ${{ steps.check-cache.outputs.cache-exists != 'true' }}
run: |
yarn
npx vite build --mode prod

- name: Inject config-id in webapp.ini
run: |
touch build/public/.webapp.ini
echo "defaultConfigSource=${{ github.event.inputs.tag }}" > build/public/.webapp.ini

- name: Uploading artifact
if: always()
uses: actions/upload-artifact@v3
with:
name: webapp-${{ github.event.inputs.tag }}
path: ./build
retention-days: 1
24 changes: 24 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Linting

on: [workflow_dispatch]

jobs:
lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: yarn install, lint
run: |
yarn install
yarn lint
env:
CI: true
9 changes: 1 addition & 8 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
name: Test - End to End

on:
pull_request:
branches: [ 'develop', 'feat/*', 'feature/*', 'release', 'release-candidate' ]
push:
branches: [ 'develop', 'release', 'release-candidate' ]
schedule:
- cron: '30 3 * * 1-5'
workflow_dispatch:
on: [workflow_dispatch]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-linting.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Test - Linting

on: [pull_request]
on: [workflow_dispatch]

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-unit-snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Test - Unit and Snapshot

on: [pull_request]
on: [workflow_dispatch]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@adyen/adyen-web": "^5.42.1",
"@codeceptjs/allure-legacy": "^1.0.2",
"@inplayer-org/inplayer.js": "^3.13.13",
"@inplayer-org/inplayer.js": "^3.13.17",
"classnames": "^2.3.1",
"date-fns": "^2.28.0",
"dompurify": "^2.3.8",
Expand Down
1 change: 1 addition & 0 deletions plugins/appbuilder
Submodule appbuilder added at 965fb6
33 changes: 32 additions & 1 deletion src/components/ChooseOfferForm/ChooseOfferForm.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
justify-content: center;
margin-bottom: 24px;

> input {
> input {
&:checked + .label {
border-radius: 4px;
transform: scale(1.02);
Expand Down Expand Up @@ -137,3 +137,34 @@
font-size: 12px;
}
}

.productInfo {
display: flex;
flex-direction: column;
align-items: center;
gap: 16px;
padding: 16px 0;
}

.productImage {
width: 100%;
height: 300px;
object-fit: cover;
overflow: hidden;
border: 1px solid rgba(variables.$white, 0.34);
border-radius: 4px;
transition: all 0.2s ease;

&:hover {
border-color: variables.$white;
transform: scale(1.02);
cursor: pointer;
}
}

.productImageZoomed {
width: 100%;
height: auto;
border: 1px solid rgba(variables.$white, 0.34);
border-radius: 4px;
}
Loading
Loading