Skip to content

Commit 04342b9

Browse files
Beta Release Update
Added and modified tons of things for the beta release.
1 parent be51ac2 commit 04342b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1056
-273
lines changed
11.7 KB
Loading

VITask Desktop/assets/img/bg.jpg

-122 KB
Binary file not shown.

VITask Desktop/assets/img/bg3.jpg

-267 KB
Binary file not shown.
-454 KB
Binary file not shown.

VITask Desktop/assets/img/city.jpg

-208 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-78.9 KB
Binary file not shown.
-107 KB
Binary file not shown.
-263 KB
Binary file not shown.
-210 KB
Binary file not shown.
-96.1 KB
Binary file not shown.
-173 KB
Binary file not shown.
-74.5 KB
Binary file not shown.
-64.9 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-98.1 KB
Binary file not shown.
-115 KB
Binary file not shown.
-98.4 KB
Binary file not shown.

VITask Desktop/assets/img/landing.jpg

-203 KB
Binary file not shown.

VITask Desktop/assets/img/profile.jpg

-156 KB
Binary file not shown.
-631 KB
Binary file not shown.
-1.73 MB
Binary file not shown.

VITask Desktop/build.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
var electronInstaller = require('electron-winstaller');
2+
3+
// In this case, we can use relative paths
4+
var settings = {
5+
// Specify the folder where the built app is located
6+
appDirectory: './release-builds/VITask-win32-ia32',
7+
// Specify the existing folder where
8+
outputDirectory: './installer',
9+
// The name of the Author of the app (the name of your company)
10+
authors: 'VITask',
11+
// The name of the executable of your built
12+
exe: './VITask.exe'
13+
};
14+
15+
resultPromise = electronInstaller.createWindowsInstaller(settings);
16+
17+
resultPromise.then(() => {
18+
console.log("The installers of your application were succesfully created !");
19+
}, (e) => {
20+
console.log(`Well, sometimes you are not so lucky: ${e.message}`)
21+
});

VITask Desktop/css/style.css

Lines changed: 0 additions & 160 deletions
This file was deleted.

VITask Desktop/dashboard.html

Lines changed: 73 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,6 @@ <h4 class="card-title">My Profile</h4>
580580
</div>
581581
</div>
582582
583-
<button type="submit" class="btn btn-danger pull-right">Settings</button>
584583
<div class="clearfix"></div>
585584
</form>
586585
</div>
@@ -1275,7 +1274,7 @@ <h4 class="card-title ">${course}-${type}</h4>
12751274
$("#timetablenav").attr('class', 'nav-item');
12761275
$("#resyncnav").attr('class', 'nav-item');
12771276
$("#logoutnav").attr('class', 'nav-item');
1278-
$("#topheading").html("Moodle Login");
1277+
$("#topheading").html("Moodle Assignments");
12791278

12801279
data.findOne({ moodle: 'user-moodle' }, function(err, doc) {
12811280
let assignment = doc.Assignments;
@@ -1287,12 +1286,18 @@ <h4 class="card-title ">${course}-${type}</h4>
12871286

12881287
let coursename = Object.values(assignment[i])[0];
12891288
let deadline = Object.values(assignment[i])[2];
1289+
1290+
let splitter = coursename.split("(");
1291+
splitter[1] = splitter[1].substring(0, splitter[1].length - 1);
1292+
let sendcourse = splitter.join(" ");
1293+
sendcourse = sendcourse.split(" ");
1294+
let sendtime = deadline.split(" ");
12901295

12911296
content += `<tr id="assign${assignment_count}"> <td>${coursename}</td>
12921297
<td>${deadline}</td>
12931298
<td class="td-actions text-right">
1294-
<button onclick="hideme(${assignment_count})" type="button" rel="tooltip" title="Remove" class="btn1 btn1-round bg-danger text-white">
1295-
<span>Remove</span>
1299+
<a onclick="hideme(${assignment_count})" rel="tooltip" title="Remove" class="text-danger" style="cursor: pointer;">
1300+
<i class="material-icons">clear</i>
12961301
</button>
12971302
</td>
12981303
</tr>`
@@ -1301,60 +1306,60 @@ <h4 class="card-title ">${course}-${type}</h4>
13011306
<td>${coursename}</td>
13021307
<td>${deadline}</td>
13031308
<td class="td-actions text-right">
1304-
<button type="button" onclick="showme(${assignment_count})" rel="tooltip" title="Remove" class="btn1 btn1-round bg-danger text-white">
1305-
<span>Move Back</span>
1306-
</button>
1309+
<a onclick="showme(${assignment_count})" rel="tooltip" title="Restore" class="text-success" style="cursor: pointer;">
1310+
<i class="material-icons">done</i>
1311+
</a>
13071312
</td>
13081313
</tr>`
13091314

13101315
assignment_count++;
13111316
}
13121317

13131318
finalcontent += `<div class="col-md-12">
1314-
<div class="card">
1315-
<div class="card-header card-header-tabs card-header-primary">
1316-
<div class="nav-tabs-navigation">
1317-
<div class="nav-tabs-wrapper">
1318-
<span class="nav-tabs-title"></span>
1319-
<ul class="nav nav-tabs" data-tabs="tabs">
1320-
<li class="nav-item">
1321-
<a class="nav-link active" href="#profile" data-toggle="tab">
1322-
<i class="material-icons">bug_report</i> Current Assignments
1323-
<div class="ripple-container"></div>
1324-
</a>
1325-
</li>
1326-
<li class="nav-item">
1327-
<a class="nav-link" href="#messages" data-toggle="tab">
1328-
<i class="material-icons">code</i> Removed Assignments
1329-
<div class="ripple-container"></div>
1330-
</a>
1331-
</li>
1332-
</ul>
1333-
</div>
1334-
</div>
1335-
</div>
1336-
<div class="card-body">
1337-
<div class="tab-content">
1338-
<div class="tab-pane active" id="profile">
1339-
<table class="table">
1340-
<tbody>
1341-
<th>Name</th>
1342-
<th>Deadline</th>
1343-
<th></th>`+content+`</tbody>
1344-
</table>
1345-
</div>
1346-
<div class="tab-pane" id="messages">
1347-
<table class="table">
1348-
<tbody>
1349-
<th>Name</th>
1350-
<th>Deadline</th>
1351-
<th></th>`+content2+` </tbody>
1352-
</table>
1353-
</div>
1354-
</div>
1355-
</div>
1356-
</div>
1357-
</div>`;
1319+
<div class="card">
1320+
<div class="card-header card-header-tabs card-header-danger">
1321+
<div class="nav-tabs-navigation">
1322+
<div class="nav-tabs-wrapper">
1323+
<span class="nav-tabs-title"></span>
1324+
<ul class="nav nav-tabs" data-tabs="tabs">
1325+
<li class="nav-item">
1326+
<a class="nav-link active" href="#profile" data-toggle="tab">
1327+
<i class="material-icons">playlist_add_check</i> Current Assignments
1328+
<div class="ripple-container"></div>
1329+
</a>
1330+
</li>
1331+
<li class="nav-item">
1332+
<a class="nav-link" href="#messages" data-toggle="tab">
1333+
<i class="material-icons">not_interested</i> Removed Assignments
1334+
<div class="ripple-container"></div>
1335+
</a>
1336+
</li>
1337+
</ul>
1338+
</div>
1339+
</div>
1340+
</div>
1341+
<div class="card-body">
1342+
<div class="tab-content">
1343+
<div class="tab-pane active" id="profile">
1344+
<table class="table">
1345+
<tbody>
1346+
<th>Name</th>
1347+
<th>Deadline</th>
1348+
<th></th>`+content+`</tbody>
1349+
</table>
1350+
</div>
1351+
<div class="tab-pane" id="messages">
1352+
<table class="table">
1353+
<tbody>
1354+
<th>Name</th>
1355+
<th>Deadline</th>
1356+
<th></th>`+content2+` </tbody>
1357+
</table>
1358+
</div>
1359+
</div>
1360+
</div>
1361+
</div>
1362+
</div>`;
13581363

13591364
$("#canvas").html(finalcontent);
13601365

@@ -1472,22 +1477,6 @@ <h4 class="card-title">Integrate Moodle</h4>
14721477
$(document).ready(function() {
14731478
$("#loading").fadeOut();
14741479
})
1475-
1476-
function hideme(id)
1477-
{
1478-
let ass_id = "#assign"+String(id);
1479-
let removed = "#removed"+String(id);
1480-
$(ass_id).hide();
1481-
$(removed).attr("style","");
1482-
}
1483-
1484-
function showme(id)
1485-
{
1486-
let ass_id = "#assign"+String(id);
1487-
let removed = "#removed"+String(id);
1488-
$(removed).attr("style","display:none;");
1489-
$(ass_id).show();
1490-
}
14911480

14921481

14931482
function Bunk_add(id){
@@ -1799,6 +1788,23 @@ <h4 class="card-title">Integrate Moodle</h4>
17991788
});
18001789
}
18011790

1791+
function hideme(id)
1792+
{
1793+
let ass_id = "#assign"+String(id);
1794+
let removed = "#removed"+String(id);
1795+
$(ass_id).hide();
1796+
$(removed).attr("style","");
1797+
}
1798+
1799+
function showme(id)
1800+
{
1801+
let ass_id = "#assign"+String(id);
1802+
let removed = "#removed"+String(id);
1803+
$(removed).attr("style","display:none;");
1804+
$(ass_id).show();
1805+
}
1806+
1807+
18021808
function login(regno,password,moodle_username=null,moodle_password=null,mode=null){
18031809
let url = 'https://vitask.me/authenticate?username='+regno+'&password='+password;
18041810
let timetable_ini_url = 'https://vitask.me/timetableapi?token=';
@@ -2252,7 +2258,6 @@ <h4 class="card-title">Integrate Moodle</h4>
22522258
$window.on('load', check_if_in_view);
22532259

22542260
</script>
2255-
<script src="assign.js"></script>
22562261

22572262

22582263

0 commit comments

Comments
 (0)