Skip to content

Commit

Permalink
Version 1.0.1.
Browse files Browse the repository at this point in the history 
* Upgrade packages.
* Migration from Bootstrap v3 to v4.
  • Loading branch information
@roncli
roncli committed Jan 6, 2019
1 parent 2555ced commit b6dcae3
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 40 deletions.
6 changes: 5 additions & 1 deletion README.md
View file
Expand Up @@ -14,5 +14,9 @@ To run:


## Releases ## Releases


### 1.0.1 - 1/5/2019
* Dependency upgrades.
* New design to support the upgrade to Bootstrap v4.

### 1.0 - 1/16/2017 ### 1.0 - 1/16/2017
* Initial version * Initial version.
1 change: 1 addition & 0 deletions app/index.js
View file
Expand Up @@ -6,6 +6,7 @@ var win,
win.loadURL("file://" + __dirname + "/site/index.htm"); win.loadURL("file://" + __dirname + "/site/index.htm");
win.setMenu(null); win.setMenu(null);
win.maximize(); win.maximize();
// win.toggleDevTools(); // Uncomment to debug.


win.once("ready-to-show", () => { win.once("ready-to-show", () => {
win.show(); win.show();
Expand Down
15 changes: 8 additions & 7 deletions app/package.json
View file
@@ -1,19 +1,20 @@
{ {
"name": "ChatterGrid", "name": "ChatterGrid",
"productName": "ChatterGrid", "productName": "ChatterGrid",
"author":{ "author": {
"name": "Ronald M. Clifford", "name": "Ronald M. Clifford",
"email": "roncli@roncli.com", "email": "roncli@roncli.com",
"url": "http://www.roncli.com" "url": "http://www.roncli.com"
}, },
"dependencies": { "dependencies": {
"angular": "1.6.1", "@fortawesome/fontawesome-free": "5.6.3",
"bootstrap": "3.3.7", "angular": "1.7.5",
"jquery": "3.1.1", "bootstrap": "4.2.1",
"jszip": "3.1.3", "jquery": "3.3.1",
"mmmagic": "0.4.5" "jszip": "3.1.5",
"mmmagic": "0.5.2"
}, },
"version": "1.0.0", "version": "1.0.1",
"description": "An application to easily create and share custom soundboards.", "description": "An application to easily create and share custom soundboards.",
"repository": { "repository": {
"type": "git", "type": "git",
Expand Down
11 changes: 8 additions & 3 deletions app/site/index.css
View file
Expand Up @@ -5,6 +5,7 @@ html, body {
body { body {
position: relative; position: relative;
color: #000000 !important; color: #000000 !important;
line-height: 1.2;
} }


.background { .background {
Expand All @@ -21,12 +22,16 @@ body {
padding-top: 20px; padding-top: 20px;
} }


.sound-panel { #sounds .card {
margin-bottom: 20px;
}

.sound-card {
position: relative; position: relative;
} }


.sound-name { .sound-name {
padding: 15px 15px 0 15px; padding: 20px 15px 5px 15px;
} }


.sound-name .input-group { .sound-name .input-group {
Expand All @@ -50,6 +55,6 @@ body {
font-size: 72px; font-size: 72px;
} }


.panel-body { .card-body {
padding: 2px; padding: 2px;
} }
53 changes: 29 additions & 24 deletions app/site/index.htm
View file
Expand Up @@ -2,6 +2,7 @@
<head> <head>
<title>ChatterGrid</title> <title>ChatterGrid</title>
<link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" /> <link rel="stylesheet" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="../node_modules/@fortawesome/fontawesome-free/css/all.min.css" />
<link rel="stylesheet" href="index.css" /> <link rel="stylesheet" href="index.css" />
<script src="../node_modules/jquery/dist/jquery.min.js"></script> <script src="../node_modules/jquery/dist/jquery.min.js"></script>
<script>window.$ = window.jQuery = require("jquery");</script> <script>window.$ = window.jQuery = require("jquery");</script>
Expand All @@ -12,42 +13,44 @@
<div class="text-center background"> <div class="text-center background">
ChatterGrid ChatterGrid
</div> </div>
<div class="container row center-block"> <div class="container">
<div class="col-xs-12"> <div class="row justify-content-md-center">
<nav class="navbar navbar-inverse"> <div class="col">
<ul class="nav navbar-nav"> <nav class="navbar navbar-expand-sm navbar-dark bg-dark">
<li><a href="#" ng-click="loadGrid()"><b>Load Grid</b></a></li> <ul class="navbar-nav">
<li><a href="#" ng-click="saveGrid()"><b>Save Grid</b></a></li> <li class="nav-item"><a class="nav-link" href="#" ng-click="loadGrid()"><b>Load Grid</b></a></li>
<li><a href="#" ng-click="shareGrid()"><b>Share Grid</b></a></li> <li class="nav-item"><a class="nav-link" href="#" ng-click="saveGrid()"><b>Save Grid</b></a></li>
</ul> <li class="nav-item"><a class="nav-link" href="#" ng-click="shareGrid()"><b>Share Grid</b></a></li>
</nav> </ul>
</nav>
</div>
</div> </div>
</div> </div>
<div ng-if="sounds" class="container-fluid"> <div ng-if="sounds" class="container-fluid">
<div id="sounds" class="row"> <div id="sounds" class="row">
<div ng-repeat="sound in sounds" class="sound col-sm-4 col-md-3 col-lg-2"> <div ng-repeat="sound in sounds" class="sound col-md-4 col-lg-3 col-xl-2">
<div class="panel panel-defualt"> <div class="card">
<div class="panel-body sound-panel"> <div class="card-body sound-card">
<button class="btn btn-xs btn-danger close-button" ng-click="delete(sound)" title="Delete sound from ChatterGrid"><span class="glyphicon glyphicon-remove"></span></button> <button class="btn btn-sm btn-danger close-button" ng-click="delete(sound)" title="Delete sound from ChatterGrid"><span class="fas fa-times"></span></button>
<div class="sound-name" ng-if="sound.edit"> <div class="sound-name" ng-if="sound.edit">
<div class="input-group"> <div class="input-group">
<textarea class="form-control" rows="3" placeholder="Sound name" style="resize: none;" ng-model="sound.nameEdit"></textarea> <textarea class="form-control" rows="3" placeholder="Sound name" style="resize: none;" ng-model="sound.nameEdit"></textarea>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-primary sound-name-change" type="button" ng-click="changeName(sound)" title="Change sound name"><span class="glyphicon glyphicon-ok"></span></button> <button class="btn btn-primary sound-name-change" type="button" ng-click="changeName(sound)" title="Change sound name"><span class="fas fa-check"></span></button>
</span> </span>
</div> </div>
</div> </div>
<div class="sound-name" ng-if="!sound.edit"> <div class="sound-name" ng-if="!sound.edit">
{{sound.name}} {{sound.name}}
</div> </div>
<div> <div>
<div class="pull-left"> <div class="float-left">
<button ng-class="{btn: true, 'btn-sm': true, 'btn-primary': !sound.edit, 'btn-danger': sound.edit}" ng-click="edit(sound)" title="Edit name"><span class="glyphicon glyphicon-pencil"></span></button> <button ng-class="{btn: true, 'btn-sm': true, 'btn-primary': !sound.edit, 'btn-danger': sound.edit}" ng-click="edit(sound)" title="Edit name"><span class="fas fa-pencil-alt"></span></button>
</div> </div>
<div class="pull-right"> <div class="float-right">
<button class="btn btn-sm btn-primary" ng-if="sound.audio.paused" ng-click="play(sound)" title="Play sound"><span class="glyphicon glyphicon-play"></span></button> <button class="btn btn-sm btn-primary" ng-if="sound.audio.paused" ng-click="play(sound)" title="Play sound"><span class="fas fa-play"></span></button>
<button class="btn btn-sm btn-primary" ng-if="!sound.audio.paused" ng-click="pause(sound)" title="Pause sound"><span class="glyphicon glyphicon-pause"></span></button> <button class="btn btn-sm btn-primary" ng-if="!sound.audio.paused" ng-click="pause(sound)" title="Pause sound"><span class="fas fa-pause"></span></button>
<button class="btn btn-sm btn-primary" ng-if="!sound.audio.paused" ng-click="stop(sound)" title="Stop sound"><span class="glyphicon glyphicon-stop"></span></button> <button class="btn btn-sm btn-primary" ng-if="!sound.audio.paused" ng-click="stop(sound)" title="Stop sound"><span class="fas fa-stop"></span></button>
</div> </div>
</div> </div>
</div> </div>
Expand All @@ -56,10 +59,12 @@
</div> </div>
</div> </div>
<div ng-if="sounds.length === 0"> <div ng-if="sounds.length === 0">
<div class="container row center-block"> <div class="container">
<div class="col-xs-12"> <div class="row center-block">
<div class="text-center drop jumbotron"> <div class="col">
Drag audio files here to add them to the grid! <div class="text-center drop jumbotron">
Drag audio files here to add them to the grid!
</div>
</div> </div>
</div> </div>
</div> </div>
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
@@ -1,15 +1,15 @@
{ {
"name": "ChatterGrid", "name": "ChatterGrid",
"productName": "ChatterGrid", "productName": "ChatterGrid",
"author":{ "author": {
"name": "Ronald M. Clifford", "name": "Ronald M. Clifford",
"email": "roncli@roncli.com", "email": "roncli@roncli.com",
"url": "http://www.roncli.com" "url": "http://www.roncli.com"
}, },
"version": "1.0.0", "version": "1.0.1",
"build": { "build": {
"appId": "com.electron.chattergrid", "appId": "com.electron.chattergrid",
"copyright": "©2016-2017 roncli Productions", "copyright": "©2016-2019 roncli Productions",
"productName": "ChatterGrid", "productName": "ChatterGrid",
"compression": "maximum", "compression": "maximum",
"nsis": { "nsis": {
Expand All @@ -31,8 +31,8 @@
"dist": "node_modules/.bin/build" "dist": "node_modules/.bin/build"
}, },
"devDependencies": { "devDependencies": {
"electron-builder": "11.3.0", "electron": "4.0.1",
"electron-prebuilt": "1.4.13" "electron-builder": "20.38.4"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
Expand Down

0 comments on commit b6dcae3

Please sign in to comment.