Skip to content

Commit 5ad03be

Browse files
yeskarthikyeskarthik
committed
Moved to store.js
1 parent eb47a8d commit 5ad03be

File tree

4 files changed

+69
-81
lines changed

4 files changed

+69
-81
lines changed

‎README.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,4 @@ faq.html - Answers for basic questions about the app.
1515

1616
FONT RENDERING
1717
Apart from the basic CSS font, we have also used Google Webfonts served from our own server
18-
"bootstrap/css/fonts" directory has the necessary .ttf files and "bootstrap/css/fonts.css" has the css which includes the fonts.
19-
20-
.box {margin-bottom:100px;}
21-
.holder{width:1050px;margin-left:auto;margin-right:auto}
22-
.tagline{text-align:center;font-family:Rancho;font-size:40px;color:gray;}
23-
#authnstart{margin-left: 360px;}
24-
.badges{margin-top:50px;padding-bottom:30px;}
25-
.screenshot{margin-right:20px; margin-left:20px;}
26-
.lmargin{margin-left:20px;}
18+
"bootstrap/css/fonts" directory has the necessary .ttf files and "bootstrap/css/fonts.css" has the css which includes the fonts.

‎resources/js/demo.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/js/start.js

Lines changed: 64 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var picker, picker1,feed, data, ar=true, aspectRatio;
22
var preloadImage = true, preloadCSV = true;
3+
var settings = new Store("settings");
34
google.setOnLoadCallback(createPicker);
45
google.load('picker',1);
56

@@ -27,32 +28,33 @@ $.ajax({url:'https://www.googleapis.com/oauth2/v1/tokeninfo?access_token='+acces
2728
});
2829

2930
$.ajax({url:'https://www.googleapis.com/oauth2/v1/userinfo?access_token='+access_info["access_token"]})
30-
.done(function(data){
31-
$.ajax({url:'http://badgeitrelay.appspot.com/badgeitupdateuser?userjson='+encodeURIComponent(JSON.stringify(data)),type:'POST'}).
32-
done(function(){
33-
console.log("Updated");
34-
});
31+
.done(function(data){
32+
$.ajax({url:'http://badgeitrelay.appspot.com/badgeitupdateuser?userjson='+encodeURIComponent(JSON.stringify(data)),type:'POST'})
33+
.done(function(){
34+
console.log("Updated");
3535
});
36+
});
37+
3638

37-
/*if(localStorage['login']!='true')
38-
{
39-
$('body').css('background-color','whitesmoke');
40-
$('body').html('<p style="font-size:20px; text-align:center; margin-top:100px">Looks like you are not logged in. Redirecting to <a href="./home.html">Home Page</a></p>');
41-
location.href='./home.html';
42-
}*/
4339
$("#template_gd").hide();
4440
$("#list_gd").hide();
4541

4642

4743
var config = {
4844
'client_id': '434888942442.apps.googleusercontent.com',
4945
'scope': 'https://www.googleapis.com/auth/drive',
50-
'immediate':false
46+
'immediate':false
5147
};
5248
var isDriveAuth = false;
5349
var holder = document.getElementById('holder');
5450

55-
localStorage["qrcode"] = "false";
51+
$("#projectName").change(function() {
52+
settings.set("projectName",this.value);
53+
});
54+
55+
//localStorage["qrcode"] = "false";
56+
settings.set("qrcode", false);
57+
5658
if (typeof window.FileReader === 'undefined') {
5759
console.log('File reader API failed');
5860
} else {
@@ -64,12 +66,14 @@ $('#qrcode').click(function() {
6466

6567
if($(this).is(':checked')){
6668
$('#qrCodeSelect').show();
67-
localStorage["qrcode"] = "true";
69+
//localStorage["qrcode"] = "true";
70+
settings.set("qrcode", true);
6871
$('#qrCodeSelect').find('select').attr("required","required");
6972
}
7073
else {
7174
$('#qrCodeSelect').hide();
72-
localStorage["qrcode"] = "false";
75+
//localStorage["qrcode"] = "false";
76+
settings.set("qrcode", false);
7377
$('#qrCodeSelect').find('select').removeAttr("required");
7478
}
7579
});
@@ -85,7 +89,8 @@ holder.ondrop = function (e) {
8589
reader = new FileReader();
8690
reader.onload = function (event) {
8791
console.log(event.target);
88-
localStorage["event-template"] = event.target.result;
92+
//localStorage["event-template"] = event.target.result;
93+
settings.set("event-template", event.target.result);
8994

9095
$('#badgepreview').attr('src', event.target.result);
9196

@@ -173,7 +178,7 @@ $('#list_gd').on('click',function(e){
173178

174179

175180

176-
$("#form1").submit(function() {
181+
$("#badgeinput").submit(function() {
177182

178183
if($('#templateChooser').val() == "" && $('#google_image').val() == "") {
179184
$("#alertmessage").html("<strong>Error!</strong> You have not selected template image.");
@@ -235,20 +240,31 @@ $("#form1").submit(function() {
235240
});
236241
if (selectedCols.length != 0) {
237242

238-
localStorage['selected-cols'] = selectedCols;
243+
//localStorage['selected-cols'] = selectedCols;
244+
settings.set("selected-cols", selectedCols);
239245
}
240246

241247

242248
if($('#qrcode').is(':checked')){
243249
$('#qrCodeSelect').find(':input:checkbox:checked').each(function() {
244250
qrSelectedCols.push(this.value);
245251
});
246-
localStorage['qr-cols'] = qrSelectedCols;
252+
//localStorage['qr-cols'] = qrSelectedCols;
253+
settings.set("qr-cols", qrSelectedCols);
247254
}
248-
249-
_gaq.push(['_trackEvent', 'Template', 'Submit', 'Project', localStorage["projectname"]]);
250-
localStorage["dimensions"] = $('#pixelwidth').val()+','+$('#pixelheight').val()+','+$('#inchwidth').val()+','+$('#inchheight').val()+','+$('#pixelwidth').val()*$('#dpi').val()/96+','+$('#pixelheight').val()*$('#dpi').val()/96;
251-
255+
settings.set("projectName",$("#projectName").val());
256+
//_gaq.push(['_trackEvent', 'Template', 'Submit', 'Project', localStorage["projectName"]]);
257+
_gaq.push(['_trackEvent', 'Template', 'Submit', 'Project', settings.get("projectName")]);
258+
dimensions = {
259+
"pixelwidth" : $('#pixelwidth').val(),
260+
"pixelheight" : $('#pixelheight').val(),
261+
"inchwidth" : $('#inchwidth').val(),
262+
"inchheight" : $('#inchheight').val(),
263+
"scalepixelw" : $('#pixelwidth').val()*$('#dpi').val()/96,
264+
"scalepixelh" : $('#pixelheight').val()*$('#dpi').val()/96
265+
}
266+
//localStorage["dimensions"] = $('#pixelwidth').val()+','+$('#pixelheight').val()+','+$('#inchwidth').val()+','+$('#inchheight').val()+','+$('#pixelwidth').val()*$('#dpi').val()/96+','+$('#pixelheight').val()*$('#dpi').val()/96;
267+
settings.set("dimensions",dimensions);
252268

253269
});
254270

@@ -270,6 +286,7 @@ function changeCsv()
270286
$('#list_fs').show();
271287
$('#list_gd').show();
272288
}
289+
273290
function loadPreview(image)
274291
{
275292
$('#badgepreview').attr('src', image);
@@ -289,13 +306,14 @@ function loadPreview(image)
289306
$('#holder').css('border','0px');
290307
$('#holder').css('background-color','white');
291308
}
309+
292310
function readFileAsDataURL(file, imageName) {
293311

294312
var reader = new FileReader();
295313

296314
reader.onload = function(event) {
297-
localStorage[imageName] =
298-
event.target.result;
315+
//localStorage[imageName] = event.target.result;
316+
settings.set("imageName") = event.target.result;
299317
loadPreview(event.target.result);
300318

301319
};
@@ -308,10 +326,12 @@ function getAsText(fileToRead, localName)
308326
var reader = new FileReader();
309327
reader.readAsText(fileToRead);
310328
reader.onload = function(event){
311-
localStorage[localName] = event.target.result;
312-
$('#csvColumnsSelect').empty();
329+
//localStorage[localName] = event.target.result;
330+
settings.set(localName, event.target.result);
331+
332+
$('#csvColumnsSelect').empty();
313333
createMultipleSelect(event.target.result, 'csvColumnsSelect', 'colselect', 'selected-cols');
314-
$('#qrCodeSelect').empty();
334+
$('#qrCodeSelect').empty();
315335
createMultipleSelect(event.target.result, 'qrCodeSelect', 'qrselect', 'qr-cols');
316336
$('#qrCodeSelect').hide();
317337
};
@@ -348,7 +368,7 @@ function clear() {
348368
$("#badgepreview").val("");
349369
$('#qrCodeSelect').empty();
350370
$('#csvColumnsSelect').empty();
351-
$("#form1").find(':input').each(function() {
371+
$("#badgeinput").find(':input').each(function() {
352372
switch(this.type) {
353373
case 'password':
354374
case 'select-multiple':
@@ -364,36 +384,6 @@ function clear() {
364384
});
365385
};
366386

367-
function move() {
368-
369-
var selectedCols = new Array();
370-
var qrSelectedCols = new Array();
371-
$('#csvColumnsSelect').find(':input:checkbox:checked').each(function() {
372-
373-
selectedCols.push(this.value);
374-
});
375-
if (selectedCols.length != 0) {
376-
377-
localStorage['selected-cols'] = selectedCols;
378-
}
379-
else if (preloadedCSV) {
380-
localStorage['selected-cols'] = "1,2";
381-
}
382-
383-
if($('#qrcode').is(':checked')){
384-
$('#qrCodeSelect').find(':input:checkbox:checked').each(function() {
385-
qrSelectedCols.push(this.value);
386-
});
387-
localStorage['qr-cols'] = qrSelectedCols;
388-
}
389-
390-
_gaq.push(['_trackEvent', 'Template', 'Submit', 'Project', localStorage["projectname"]]);
391-
localStorage["dimensions"] = $('#pixelwidth').val()+','+$('#pixelheight').val()+','+$('#inchwidth').val()+','+$('#inchheight').val();
392-
393-
394-
}
395-
396-
397387

398388
function createPicker() {
399389

@@ -451,8 +441,10 @@ function handleDriveImage(response) {
451441
blobBuilder.append(oReq.response);
452442
var blob = blobBuilder.getBlob(response.mimeType);
453443
var rdr = new FileReader();
454-
rdr.onload = function(event){localStorage['event-template'] = event.target.result;
455-
loadPreview(event.target.result);};
444+
rdr.onload = function(event){
445+
//localStorage['event-template'] = event.target.result;
446+
settings.set('event-template',event.target.result);
447+
loadPreview(event.target.result);};
456448
rdr.readAsDataURL(blob);
457449
};
458450

@@ -465,7 +457,8 @@ function handleDriveSheet(response) {
465457
$.ajax({'url':'https://badgeitrelay.appspot.com/badgeitrelay?link='+ encodeURIComponent(url), 'crossDomain':true}).
466458
done(function(data){
467459
$('#csvColumnsSelect').html("");
468-
localStorage['event-csv']=data;
460+
//localStorage['event-csv']=data;
461+
settings.set('event-csv',data);
469462
createMultipleSelect(data, 'csvColumnsSelect', 'colselect', 'selected-cols');
470463
createMultipleSelect(data, 'qrCodeSelect', 'qrselect', 'qr-cols');
471464
$('#qrCodeSelect').hide();
@@ -504,11 +497,13 @@ function setPixelHeight() {
504497
}
505498

506499
function demo() {
507-
localStorage["event-template"]= demoJSON["event-template"]
508-
localStorage["dimensions"]=demoJSON["dimensions"];
509-
localStorage["event-csv"]=demoJSON["event-csv"];
510-
localStorage['selected-cols'] = demoJSON["selected-cols"];
511-
localStorage['qrcode']=demoJSON["qrcode"];
512-
localStorage['qr-cols']=demoJSON["qr-cols"];
513-
$("#form1")[0].submit();
500+
501+
//localStorage["event-template"]= demoJSON["event-template"]
502+
//localStorage["dimensions"]=demoJSON["dimensions"];
503+
//localStorage["event-csv"]=demoJSON["event-csv"];
504+
//localStorage['selected-cols'] = demoJSON["selected-cols"];
505+
//localStorage['qrcode']=demoJSON["qrcode"];
506+
//localStorage['qr-cols']=demoJSON["qr-cols"];
507+
settings = new Store("settings", demoJSON);
508+
$("#badgeinput")[0].submit();
514509
}

‎start.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<script src="resources/js/jquery.js"></script>
88
<script src="https://apis.google.com/js/client.js"></script>
99
<script src="resources/js/jquery-csv.js"></script>
10+
<script src="resources/js/store.js"></script>
1011
<script src="bootstrap/js/bootstrap.js"></script>
1112
<script src="http://www.google.com/jsapi?key=AIzaSyD8CT73BsKLu43ZiU6jv-RCSOhF406XYy8"></script>
1213
<script src="resources/js/start.js"></script>
@@ -67,10 +68,10 @@ <h1 id="title-large"> Badge it </h1>
6768
<div class="container">
6869

6970
<div id="vetti">
70-
<form class="form-horizontal" id="form1" action="./create.html">
71+
<form class="form-horizontal" id="badgeinput" action="./create.html">
7172
<fieldset>
7273
<div class="control-group">
73-
<input type="text" placeholder="Event Name" class="input" id="projectName" name="projectName" required="required" onchange="localStorage['projectname']=this.value;"></input>
74+
<input type="text" placeholder="Event Name" class="input" id="projectName" name="projectName" required="required"></input>
7475
</div>
7576

7677
<div id="errorholder" class="alert alert-success">

0 commit comments

Comments
 (0)