Skip to content

Commit

Permalink
Merge pull request #15 from uglyrobot/video_support
Browse files Browse the repository at this point in the history
New Video streaming feature
  • Loading branch information
uglyrobot authored Jan 22, 2023
2 parents 040dd62 + be74045 commit fc644ef
Show file tree
Hide file tree
Showing 58 changed files with 42,980 additions and 5,303 deletions.
2 changes: 1 addition & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/.github
/.wordpress-org
bin
build
node_modules
tests
.distignore
Expand All @@ -18,3 +17,4 @@ package-lock.json
phpunit.xml.dist
README.md
build-aws3.sh
webpack.config.js
18 changes: 10 additions & 8 deletions .github/workflows/assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@ name: Plugin asset/readme update
on:
push:
branches:
- master
- master
jobs:
trunk:
name: Push to master
name: Push to main
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
- name: Checkout code
uses: actions/checkout@master

- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
48 changes: 26 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
# This is a basic workflow to help you get started with Actions

name: Deploy to WordPress.org

on:
push:
tags:
- '*'
release:
types: [ published ]

jobs:

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Checkout code
uses: actions/checkout@v2

- name: Build the plugin
run: |
npm install
npm run build
- name: WordPress Plugin Deploy
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
env:
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
- name: WordPress Plugin Deploy
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
env:
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}

- name: Create Github release
uses: ncipollo/release-action@v1
with:
artifacts: ${{github.workspace}}/${{ github.event.repository.name }}.zip
body: ${{ github.event.head_commit.message }}
token: ${{ secrets.GITHUB_TOKEN }}
artifactContentType: application/zip
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{ steps.deploy.outputs.zip-path }}
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/bin/
/node_modules/
/build/
/inc/video/block/build/
.idea
.DS_Store
Binary file modified .wordpress-org/screenshot-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed .wordpress-org/screenshot-4.png
Binary file not shown.
Binary file added .wordpress-org/screenshot-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-6.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-7.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
119 changes: 86 additions & 33 deletions inc/assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ body.mobile.modal-open #wpwrap {
}

.card {
margin-top: inherit;
padding: inherit;
min-width: inherit;
max-width: inherit;
box-shadow: inherit;
background: inherit;
box-sizing: inherit;
background-color: #ffffff;
margin-top: inherit;
padding: 0;
min-width: inherit;
max-width: 100%;
box-shadow: inherit;
background: inherit;
box-sizing: inherit;
background-color: #ffffff;
width: 100%;
}

.card-header {
Expand Down Expand Up @@ -67,40 +68,46 @@ body.mobile.modal-open #wpwrap {
}

.btn-info {
background-color: #EE7C1E;
border-radius: 24px;
border-width: 0;
background-color: #EE7C1E;
border-radius: 24px;
border-width: 0;
color: #ffffff;
}

.btn-info:hover, .btn-info:active, .btn-info:focus {
background-color: rgba(238, 124, 30, 0.7) !important;
border: none !important;
box-shadow: none !important;
box-shadow: none !important;
}

.btn-info:active {
background-color: rgba(238, 124, 30, 0.9) !important;
background-color: rgba(238, 124, 30, 0.9) !important;
}

.btn .dashicons {
font-size: 1.8rem;
line-height: 1;
margin-right: 1rem;
font-size: 1.5rem;
line-height: 1;
margin-right: 0.5rem;
}

.progress {
height: 30px;
border-radius: 15px;
padding: 5px;
.btn-lg .dashicons {
font-size: 1.8rem;
margin-right: 1rem;
}

.progress .progress-bar {
background-color: rgba(38, 169, 224, 1);
border-radius: 10px;
#iup-settings-page .progress {
height: 30px;
border-radius: 15px;
padding: 5px;
}

#iup-settings-page .progress .progress-bar {
background-color: rgba(38, 169, 224, 1);
border-radius: 10px;
}

.progress.download .progress-bar {
background-color: #EE7C1E;
#iup-settings-page .progress.download .progress-bar {
background-color: #EE7C1E;
}

.tooltip {
Expand Down Expand Up @@ -139,12 +146,8 @@ body.mobile.modal-open #wpwrap {
font-size: 25px;
}

.iup-enabled-status .dashicons-cloud-saved {
color: rgba(38, 169, 224, 1);
}

.iup-enabled-status .dashicons-cloud-upload {
color: #EE7C1E;
.iup-enabled-status .dashicons-cloud-saved, .iup-enabled-status .dashicons-video-alt3 {
color: rgba(38, 169, 224, 1);
}

p.lead {
Expand Down Expand Up @@ -195,6 +198,56 @@ p.lead {
}

#iup-collapse-errors .list-group-item {
padding: 0.25rem 1.25rem;
margin: 0;
padding: 0.25rem 1.25rem;
margin: 0;
}

/* --------- Stream Settings--------- */
#stream-nav-tab {
margin-bottom: -0.8rem;
}

li.nav-item {
margin-bottom: 0;
}

.form-check .form-check-input {
margin-top: .25em;
}

.iup-video-thumb {
background-size: cover;
background-position: 50% 50%;
background-repeat: no-repeat;
background-color: #000000;
}

.uppy-StatusBar {
margin-top: 2em;
}

.uppy-StatusBar-progress {
height: 1em;
background-color: #26a9e0;
}

.uppy-StatusBar::before {
height: 1em;
}

.uppy-StatusBar-content {
margin-top: 1em;
}

.uppy-StatusBar-actions {
margin-top: 1em;
}

.uppy-DragDrop-inner {
padding: 40px 20px;
}

.uppy-DragDrop-arrow {
width: 40px;
height: 40px;
}
10 changes: 10 additions & 0 deletions inc/assets/img/iu-logo-blue-sm.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added inc/assets/img/video-player.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit fc644ef

Please sign in to comment.