Skip to content

Feature/wstf 15 #16

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.

Sign up for GitHub

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

Open
mcr-michelleashwini wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Feature/wstf 15 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6347a1
#15 Added Artist Name and Album Name input fields. Also updated the o…
mcr-michelleashwini Mar 22, 2017
440e410
#15 Updated number match for verse tags print. Added input fields for…
mcr-michelleashwini Mar 22, 2017
8a47f64
#15 Moved xml converter files to xml-converter folder. Removed all xm…
mcr-michelleashwini Mar 22, 2017
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
2 changes: 1 addition & 1 deletion worshipsong/tag-formatter/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Worship Song Tag Formatter</h1>
</div>
</div>
<div class="col-xs-5">
<textarea disabled id="output" class="form-control" rows="35" placeholder="Generated Song"></textarea>
<textarea readonly id="output" class="form-control" rows="35" placeholder="Generated Song"></textarea>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion worshipsong/tag-formatter/scripts/generateTags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function generateSongWithTags() {
var lines = input.split('\n');
var generatedText ="";
for(var i = 0;i < lines.length; i++){
var verseNumber = lines[i].match(/^[1-9]/);
var verseNumber = lines[i].match(/^\d+/);
if (verseNumber != null) {
generatedText = generatedText + "---[Verse:" + verseNumber + "]---" + '\n';
}
Expand Down
8 changes: 6 additions & 2 deletions worshipsong/tag-formatter/styles/worshipsong-lyrics.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ body{

.ws-header{
text-align: center;
margin-top: 50px;
margin-bottom: 50px;
margin-top: 35px;
margin-bottom: 20px;
}

.ws-row{
Expand All @@ -15,4 +15,8 @@ body{
.btn{
width: 150px;
height: 40px;
}

.ws-songDetails{
margin-bottom: 15px;
}
56 changes: 56 additions & 0 deletions worshipsong/xml-converter/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
<head>
<title>Tag Generator</title>
<link rel="stylesheet" type="text/css" href="styles/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="styles/worshipsong-lyrics.css" >
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300, 400' rel='stylesheet' type='text/css'>
</head>
<body>
<div class="col-xs-12 ws-header">
<h1>Worship Song Tag Formatter</h1>
</div>
<div class="container-fluid">
<div class="col-xs-12 ws-songDetails">
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Song Title" id="songTitle">
</div>
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Alternative Song Title" id="altSongTitle">
</div>
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Artist Name">
</div>
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Album Name">
</div>
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Genre">
</div>
<div class="col-xs-2">
<input type="text" class="form-control" placeholder="Video URL">
</div>
</div>
<div class="col-xs-12">
<div class="col-xs-5">
<textarea id="userInput" class="form-control" rows="35" placeholder="Enter song lyrics here"></textarea>
</div>
<div class="col-xs-2" style="text-align: center">
<div class="row ws-row">
<button type="button" class="btn btn-success" onclick="generateSongWithTags()">Generate tags</button>
</div>
<div class="row ws-row">
<button type="reset" class="btn btn-danger" onclick="clearText()">Clear text</button>
</div>
</div>
<div class="col-xs-5">
<textarea readonly id="output" class="form-control" rows="35" placeholder="Generated Song"></textarea>
</div>
</div>
</div>
<!--Scripts-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="scripts/bootstrap.min.js"></script>
<script src="scripts/generateTags.js"></script>
</body>
</html>
7 changes: 7 additions & 0 deletions worshipsong/xml-converter/scripts/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions worshipsong/xml-converter/scripts/generateTags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* @author Michelle Ashwini
*/
var lyrics = document.getElementById('userInput');

function generateSongWithTags() {
var input = lyrics.value;
var lines = input.split('\n');
var title = document.getElementById('songTitle').value;
var altTitle = document.getElementById('altSongTitle').value;
var generate = "<title>" + title + "</title>" + '\n' + "<title>" + altTitle + "</title>" + '\n';
var generatedText = generate + "";
for(var i = 0;i < lines.length; i++){
var verseNumber = lines[i].match(/^\d+/);
if (verseNumber != null) {
generatedText = generatedText + "---[Verse:" + verseNumber + "]---" + '\n';
}
if( lines[i].match(/[A-z]|[0-9]{2}/) != null || ! /\S/.test(lines[i])){
generatedText = generatedText + lines[i] + "<br/>" + '\n';
}else{
generatedText = generatedText + "<tag name=\"y\">" + lines[i] + "</tag><br/>" + '\n';
}
}
document.getElementById('output').value = generatedText;
}

function clearText() {
document.getElementById('userInput').value = "";
document.getElementById('output').value = "";
}
6 changes: 6 additions & 0 deletions worshipsong/xml-converter/styles/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions worshipsong/xml-converter/styles/worshipsong-lyrics.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
body{
font-family:'Open Sans', sans-serif;
}

.ws-header{
text-align: center;
margin-top: 35px;
margin-bottom: 20px;
}

.ws-row{
margin: 10px;
}

.btn{
width: 150px;
height: 40px;
}

.ws-songDetails{
margin-bottom: 15px;
}