Skip to content

Release/1.0.0 #35

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 168 commits into from
Mar 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
c03fa23
Initial develop commit. Clean slate for beginning of v2.
AMalley Jun 23, 2020
f3ba28e
Initial Vue-Cli plugin electron builder push
AMalley Jul 27, 2020
f9a2410
Added vue config with electron builder options.
AMalley Jul 27, 2020
62a4267
Moved main and renderer code into separate folders. Setup vue config …
AMalley Jul 27, 2020
d692b04
Added GitHub build-release action. Dropped version to 0.0.1
AMalley Jul 27, 2020
96243dc
Adding placeholder example Windows & Mac signing variables to the bui…
AMalley Jul 27, 2020
ff4c731
Merge pull request #18 from SpringRoll/feature/vue-cli-electron
chipbell4 Jul 28, 2020
146c6bf
Renderer unit testing and eslint implementation
AMalley Jul 28, 2020
c96b632
Merge pull request #22 from SpringRoll/feature/electron-build-setup
chipbell4 Jul 28, 2020
ad6aa49
Fixed 'require is not defined' for renderer unit testing
AMalley Jul 29, 2020
1e131bb
Renderer and main unit tests. Added full-test github action and added…
AMalley Jul 29, 2020
e7d3311
Explicitly setting files for karma
AMalley Jul 29, 2020
f213cef
Removed @vue/cli-plugin-eslint
AMalley Jul 30, 2020
a72423a
Renamed testing step
AMalley Jul 30, 2020
4200968
Renamed testing step in build-release.
AMalley Jul 30, 2020
bb2e69c
Merge pull request #23 from SpringRoll/feature/unit-testing
chipbell4 Jul 30, 2020
241b9aa
Setup persistent state management for electron-store.
AMalley Jul 30, 2020
17597b0
Setup main/renderer process storage bridge.
AMalley Jul 31, 2020
1860850
Persistent state unit test.
AMalley Jul 31, 2020
6ee24fc
Removed unused import statement.
AMalley Aug 4, 2020
2f88ae0
Merge pull request #24 from SpringRoll/feature/presistent-state
chipbell4 Aug 4, 2020
4b43dd6
Setup vue router and added landing page
AMalley Aug 6, 2020
508e1aa
Renderer landing page, and main studio singleton and project info pro…
AMalley Aug 7, 2020
46d813b
Fixed error log out
AMalley Aug 7, 2020
bd07d68
Beginning to setup preview page
AMalley Aug 10, 2020
91ccfeb
Removed material references.
AMalley Aug 11, 2020
870efcf
Removed more references to material
AMalley Aug 11, 2020
1126cb3
Added preview target prompt dialog and implemented it in landing page.
AMalley Aug 11, 2020
e06b9aa
Little bit of preview url sanitization and added storage for game pre…
AMalley Aug 11, 2020
09929c0
Persistent preview target dialog logic
AMalley Aug 11, 2020
8cc96f3
Fixing some npm ci issues I saw
chipbell4 Aug 11, 2020
3c6ec88
Added some preview dialog docs and fix logic bug
AMalley Aug 11, 2020
c0111dc
minor html formatting
AMalley Aug 11, 2020
5476799
Preview target dialog updates.
AMalley Aug 12, 2020
f91f1da
Web view loading localhost
AMalley Aug 12, 2020
75210e5
Springroll Container game previewer.
AMalley Aug 14, 2020
d252d4b
Adjustments to landing page tests. Now using sinon to remove async te…
AMalley Aug 14, 2020
40a67b2
Merge branch 'feature/start-page' into feature/game-preview
AMalley Aug 14, 2020
a67c982
Merge pull request #25 from SpringRoll/feature/start-page
chipbell4 Aug 14, 2020
e76a741
Implementing vue testing utils and refactored LandingPage and Presist…
AMalley Aug 14, 2020
5347c4a
preview target dialog tests
AMalley Aug 14, 2020
b5b29b5
Some logic rework to allow navigation from the main process. More tests.
AMalley Aug 14, 2020
2f44d0c
Typo
AMalley Aug 14, 2020
6ec0268
Calling openPath on container
AMalley Aug 14, 2020
7af7dcf
move some methods to computed to help with caching
902seanryan Aug 18, 2020
385a84b
fix missed call to old function call for property
902seanryan Aug 24, 2020
ec2e80b
revert a computed property change to fix a bug
902seanryan Aug 27, 2020
dee6bd4
re-named contants directory and a few housekeeping things
902seanryan Aug 28, 2020
3bd0206
fix file url issue in preview
902seanryan Aug 31, 2020
e2d848b
Moved http addition for url targets to studio manager for consistency.
AMalley Aug 31, 2020
2567c10
Added fix for preview urls already containing https or index.html
AMalley Aug 31, 2020
ce2eafd
Removed console log
AMalley Aug 31, 2020
6376083
add new svg loader, and add initial buttons
902seanryan Sep 2, 2020
07481df
Add initial preview page svgs
902seanryan Sep 2, 2020
372acc0
BUtton stylings done
902seanryan Sep 4, 2020
509f82c
wire up container and add audio options drop down
902seanryan Sep 8, 2020
67c3a82
remove console log
902seanryan Sep 8, 2020
1d32173
Merge pull request #26 from SpringRoll/feature/game-preview
chipbell4 Sep 8, 2020
802bdae
move container to a data object and start listening for pause event
902seanryan Sep 9, 2020
45385c9
tried adding fonts
902seanryan Sep 11, 2020
d748c8b
tried adding fonts
902seanryan Sep 11, 2020
fcf32a6
removed font rule
902seanryan Sep 11, 2020
8d43b0b
Merge branch 'feature/preview-page-controls' of https://github.com/Sp…
902seanryan Sep 11, 2020
eda5eb4
update font urls
902seanryan Sep 11, 2020
aa5b93b
start switch over to using vuetify for icons
902seanryan Sep 15, 2020
60627cb
start converting rest of app to vuetify
902seanryan Sep 15, 2020
abd99af
Finish converted to vuetify
902seanryan Sep 15, 2020
21ec062
Merge branch 'develop' into feature/preview-page-controls
902seanryan Sep 15, 2020
92a3230
remove old svgs
902seanryan Sep 15, 2020
2be0c05
remove unsued svg rule
902seanryan Sep 15, 2020
3f18e7b
add refresh button
902seanryan Sep 16, 2020
26fe923
Merge pull request #28 from SpringRoll/feature/preview-page-controls
chipbell4 Sep 16, 2020
d0e3bb8
Template project creation dialog with new project location selector
AMalley Sep 3, 2020
f8b4ec1
Template type selection options.
AMalley Sep 3, 2020
1fb8a5b
Creating template projects from github
AMalley Sep 4, 2020
386cdf1
Creating templated project from local archives
AMalley Sep 8, 2020
cdda34c
Template dialog unit tests.
AMalley Sep 9, 2020
1478046
Fixed typo
AMalley Sep 9, 2020
e126541
Converted promises to async functions
AMalley Sep 11, 2020
6673b4d
Added project name field to template dialog.
AMalley Sep 11, 2020
61d5596
Adding a logger for template project creation
AMalley Sep 15, 2020
f12b439
Finished project creation report
AMalley Sep 15, 2020
28fb571
Linting and testing fixes.
AMalley Sep 16, 2020
b5e2fb7
Fixed Karma errors.
AMalley Sep 18, 2020
d5709c0
Replaced dns library with Electron net API
AMalley Sep 18, 2020
4ae0a06
Template project creation dialog with new project location selector
AMalley Sep 3, 2020
bf154ce
Template type selection options.
AMalley Sep 3, 2020
f7ab024
Creating template projects from github
AMalley Sep 4, 2020
ee2e5a4
Creating templated project from local archives
AMalley Sep 8, 2020
77c4dde
Template dialog unit tests.
AMalley Sep 9, 2020
cffd5eb
Fixed typo
AMalley Sep 9, 2020
f0bb2b4
Converted promises to async functions
AMalley Sep 11, 2020
1e48c37
Added project name field to template dialog.
AMalley Sep 11, 2020
930eb01
Merge branch 'feature/project-templating-logger' into feature/project…
AMalley Sep 18, 2020
970ebaf
Merge pull request #27 from SpringRoll/feature/project-templating
AMalley Sep 29, 2020
58d2954
install new packages for caption studio
902seanryan Sep 29, 2020
d118c9a
intial forklift of the caption studio page
902seanryan Oct 22, 2020
147e100
continue on with forklift
902seanryan Jan 21, 2021
8971b18
update to npm packages
902seanryan Feb 8, 2021
3d63c80
add codeowners file
902seanryan Feb 8, 2021
2989e7f
add changelog
902seanryan Feb 8, 2021
f706844
Merge pull request #29 from SpringRoll/chore/npm-audit
902seanryan Feb 9, 2021
98314ca
get updated vuetify largely functioning
902seanryan Feb 10, 2021
9f8698c
add unstyled home button
902seanryan Feb 11, 2021
1cdea69
revert back to folder functionality of file explorer
902seanryan Feb 11, 2021
525207e
update modules and home button
902seanryan Feb 12, 2021
80f905e
fix up some more styling issues
902seanryan Feb 16, 2021
d281888
Merge branch 'develop' into feature/caption-studio-forklift
902seanryan Feb 16, 2021
5e4dd5b
updated changelog
902seanryan Feb 16, 2021
7ae7625
trigger tests
902seanryan Feb 16, 2021
ff7f036
revert app size to default
902seanryan Feb 17, 2021
1148810
update to package lock
902seanryan Feb 17, 2021
d56e974
fix linting errors
902seanryan Feb 22, 2021
2b6d426
fix a weird test error
902seanryan Feb 22, 2021
47c3812
increase default app dimensions
902seanryan Mar 2, 2021
c467547
add caption info state and have it match project info
902seanryan Mar 3, 2021
bc9e63e
get all files returned and build out directory list
902seanryan Mar 4, 2021
1998cfa
Merge pull request #30 from SpringRoll/feature/caption-studio-forklift
902seanryan Mar 8, 2021
78d78f5
get directory list building properly
902seanryan Mar 8, 2021
5a850e1
wavesurfer udpates
902seanryan Mar 8, 2021
23b5e83
add comments to the affected components
902seanryan Mar 8, 2021
f0a5d8b
remove some console logs
902seanryan Mar 8, 2021
22f9344
revert the app size
902seanryan Mar 8, 2021
0cf3380
wire up change audio directory button and add version number to home …
902seanryan Mar 8, 2021
890dc02
add some TODO notes
902seanryan Mar 8, 2021
7baac1b
remove unused css selector
902seanryan Mar 9, 2021
332593f
cleanup
902seanryan Mar 9, 2021
65c66a1
update changelog
902seanryan Mar 9, 2021
cb2219b
fix conditional
902seanryan Mar 10, 2021
6dcab7a
add custom app menu
902seanryan Mar 11, 2021
cdaa944
add save functionality to caption studio
902seanryan Mar 11, 2021
31db030
Add CaptionStudio specific menu
902seanryan Mar 11, 2021
4c3fbcf
Add most remaining menu options
902seanryan Mar 12, 2021
12a540b
add caption file opening/loading
902seanryan Mar 12, 2021
f38cbe7
fix loading errors
902seanryan Mar 12, 2021
071ba4c
clean up menu
902seanryan Mar 15, 2021
c259a22
add unsaved changes warning when leaving caption studio
902seanryan Mar 15, 2021
42a0b3c
fix directory switching when editing json
902seanryan Mar 16, 2021
430adab
fix some importing issues
902seanryan Mar 16, 2021
b9dce2b
fix some event listeners not being turned off properly
902seanryan Mar 18, 2021
791594d
fix some event listeners not being turned off properly
902seanryan Mar 23, 2021
ee0e60b
fix bug when selecting file with existing caption on initial load
902seanryan Mar 23, 2021
2f3eda0
Merge branch 'feature/json-export' of https://github.com/SpringRoll/S…
902seanryan Mar 23, 2021
fef6a10
update project structure
902seanryan Mar 23, 2021
d98fe79
Fix bug on text editor character count
902seanryan Mar 23, 2021
d8b9d32
remove some leftover console logs
902seanryan Mar 23, 2021
3845c4f
fix testing and start writing them
902seanryan Mar 24, 2021
adc4e81
PR housekeeping
902seanryan Mar 24, 2021
b1db44f
Forgot a period
902seanryan Mar 24, 2021
87d62a4
add FileDirectory and fix other tests
902seanryan Mar 25, 2021
9fd971c
add presistent state tests
902seanryan Mar 25, 2021
e1ced3a
add text editor and json preview tests
902seanryan Mar 26, 2021
0a9a076
finish texteditor spec
902seanryan Mar 26, 2021
11b0c69
add class tests
902seanryan Mar 26, 2021
613803f
add specs that aren't easily testable
902seanryan Mar 26, 2021
38fcfe4
fix captionstudio spec and a fileprocessor bug
902seanryan Mar 29, 2021
64640e0
remove a console log and add some actual tests
902seanryan Mar 29, 2021
aa3be6e
Merge pull request #31 from SpringRoll/feature/project-audio-files
902seanryan Mar 30, 2021
c3c9890
Merge branch 'develop' into feature/json-export
902seanryan Mar 30, 2021
b6b16fb
udpate changelog
902seanryan Mar 30, 2021
4e3b89a
Merge pull request #32 from SpringRoll/feature/json-export
902seanryan Mar 30, 2021
2c0d5f5
Merge branch 'develop' into feature/caption-studio-tests
902seanryan Mar 30, 2021
048b21c
updarted changelog
902seanryan Mar 30, 2021
c159b2c
remove unused package
902seanryan Mar 30, 2021
db9ce0f
not sure why these events were removed in the first place
902seanryan Mar 30, 2021
22d02bb
Merge pull request #33 from SpringRoll/feature/caption-studio-tests
902seanryan Mar 30, 2021
46b82dd
udpate release date
902seanryan Mar 31, 2021
c2f7d45
quick update to readme
902seanryan Mar 31, 2021
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
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

59 changes: 59 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
module.exports = {
root: true,
parser: 'vue-eslint-parser',
parserOptions: {
parser: "babel-eslint",
ecmaVersion: 2020,
sourceType: "module"
},
env: {
browser: true,
node: true
},
extends: [
'plugin:vue/recommended'
],
globals: {
__static: true
},
plugins: [
'vue'
],
rules: {
"prefer-const": [
"error",
{
destructuring: "any",
ignoreReadBeforeAssign: false
}
],
"space-before-blocks": [
"error",
{ functions: "always", "keywords": "always", "classes": "always" }
],
"keyword-spacing": ["error"],
indent: ["error", 2],

"vue/max-attributes-per-line": "off",
"vue/singleline-html-element-content-newline": "off",
"vue/html-self-closing": "off",

semi: ["error", "always"],
"no-console": [0],
quotes: [2, "single"],
curly: ["error", "all"],
"no-var": "error",
"require-jsdoc": [
"error",
{
require: {
FunctionDeclaration: true,
MethodDefinition: true,
ClassDeclaration: true,
ArrowFunctionExpression: false,
FunctionExpression: true
}
}
]
}
}
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @902seanryan @aberkie @deycorinne
73 changes: 73 additions & 0 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Build/release

on:
push:
tags:
- v1.*

jobs:
full-test:
runs-on: ubuntu-latest

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

steps:
- uses: actions/checkout@v1

- name: Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: npm install
run: npm ci
env:
CI: true

- name: Running tests
uses: GabrielBB/xvfb-action@v1.2
with:
run: npm test

release:
needs: full-test

runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [macos-latest, windows-latest]

steps:
- name: Check out Git repository
uses: actions/checkout@v1

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v1
with:
node-version: 10

- name: Build/release Electron app
uses: samuelmeuli/action-electron-builder@v1
with:

# Use vue-cli-service electron:build
use_vue_cli: true

# Mac OSX signing information
# mac_certs: ${{ secrets.mac_signing_cert }}
# mac_certs_password: ${{ secrets.mac_signing_pass }}

# Windows signing information
# windows_certs:${{ secrets.win_signing_cert }}
# windows_certs_password: ${{ secrets.win_signing_pass }}

# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
github_token: ${{ secrets.github_token }}

# If the commit is tagged with a version (e.g. "v1.0.0"),
# release the app after building
release: ${{ startsWith(github.ref, 'refs/tags/v') }}
32 changes: 32 additions & 0 deletions .github/workflows/full-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Full test

on:
pull_request:
branches:
- develop

jobs:
full-test:
runs-on: ubuntu-latest

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

steps:
- uses: actions/checkout@v1

- name: Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: npm install
run: npm ci
env:
CI: true

- name: Running tests
uses: GabrielBB/xvfb-action@v1.2
with:
run: npm test
41 changes: 22 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
build
.DS_Store
node_modules
components
cache
docs
deploy/*.html
*.log
*.map
deploy/assets/js/*.js
deploy/assets/css/*.css
deploy/tasks-test.html
deploy/assets/templates/default
deploy/captions.html
/dist

deploy/index.html
build/*
!build/icons

deploy/new.html
# local env files
.env.local
.env.*.local

deploy/preview.html
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

deploy/remote.html
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

deploy/tasks-terminal.html

deploy/tasks.html
#Electron-builder output
/dist_electron
11 changes: 0 additions & 11 deletions .npmignore

This file was deleted.

20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.0] - 2020-03-31
### Added
- Unit tests added for caption studio components and classes
### Changed
- Caption Studio now reads audio files directly from project root, or user specified audio directory
- Caption studio now allows for saving/opening caption JSON files directly from projects
### Added
- This CHANGELOG
- VUE front end renderer
- Electron back end
- Project Templating via Github or bundled seed projects
- Caption Studio Initial Implementation


55 changes: 0 additions & 55 deletions Gruntfile.js

This file was deleted.

Loading