Skip to content

Commit

Permalink
Merge pull request #2 from rkayastha98/glitch
Browse files Browse the repository at this point in the history
🏘🐷 Updated with Glitch
  • Loading branch information
rkayastha98 authored Sep 17, 2020
2 parents 3423e11 + b609ee7 commit 8570521
Show file tree
Hide file tree
Showing 5 changed files with 158 additions and 142 deletions.
94 changes: 13 additions & 81 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,89 +1,21 @@
Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js
===
## Work-Play Balance

Due: September 9th, by 11:59 AM.
The website intends to help user find a balance between work and leisure tasks in their day. It helps to combat a
person's unhealthy tendency to either work, or stay unproductive for a long period of time. The website has a table
showing their list of tasks and a single bar visualization to show the work-play ratio on that day. These address
the problem as intended as they help keep track of the user's tasks. Possible future plans for this include displaying
more interactive visualizations related to the results.

This assignment aims to introduce you to the concepts and practice involved in creating a prototype (i.e. not deployment ready) two-tiered web application.

The baseline aims of this assignment involve creating an application that demonstrates the use of several specific pieces of HTML, CSS, JavaScript, and Node.js functionality.
Another aim of this assignment is to establish creative boundaries in which you and your partner can explore designing, implementing, and evaluating usable, useful, novel, and technically efficient web applications.

Baseline Requirements
---

Note that there is a very large range of application areas and possibilities that meet these baseline requirements.
Games, internet of things, organizational tools, commerce, media - all are possibilities with a two-tiered form-focused web application.

Do not limit yourselves to any of the examples given below.
Examples like the upcoming `efficiency_ratio` idea for the `cars` dataset are meant to be illustrative and easy to understand.
They are not intended to be sensible or useful ideas.

Your application is required to implement the following functionalities:

- a `Server` which not only serves files, but also maintains a tabular dataset with 3 or more fields related to your application
- a `Results` functionality which shows the entire dataset residing in the server's memory
- a `Form/Entry` functionality which allows a user to add, modify, or delete data items residing in the server's memory
- a `Server Logic` which, upon receiving new or modified "incoming" data, includes and uses a function that adds at least one additional derived field to this incoming data before integrating it with the existing dataset
- the `Derived field` for a new row of data must be computed based on fields already existing in the row. For example, a `cars` dataset with `year`, `horsepower`, and `fuel_efficiency` may create a new field `efficiency_ratio` by dividing `fuel_efficiency` by `horsepower`

Your application is required to demonstrate the use of the following concepts:

HTML:
- One or more [HTML Forms](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms), with any combination of form tags appropriate for the user input portion of the application
- Clarification: the results page can be implemented in any way. `<div>`s, `table`s, and `list`s are common choices

CSS:
- CSS styling of the primary visual elements in the application
- Various CSS Selector functionality must be demonstrated:
- Element selectors
- ID selectors
- Class selectors
- CSS positioning and sizing of the primary visual elements in the application:
- CSS to cause at least one element to be horizontally centered on the page
- CSS to cause at least one pair of elements to appear side-by-side
- CSS defined in a maintainable, readable form, in external stylesheets

JavaScript:
- At minimum, a small amount of front-end JavaScript to get / fetch data from the server; a sample is provided in this repository.

Node.js:
- An HTTP Server that delivers all necessary files and data for the application. A starting point is provided in this repository.

Deliverables
---

Do the following to complete this assignment:

1. Fork the starting project code. This repo contains some starter code that may be used or discarded as needed.
2. Implement your project with the above requirements.
3. Test your project to make sure that when someone goes to your main page, it displays correctly.
4. Deploy your project to Glitch, and fill in the appropriate fields in your package.json file.
5. Ensure that your project has the proper naming scheme `a2-yourname` so we can find it.
6. Modify the Readme to the specifications below.
7. Create and submit a Pull Request to the original repo. Label the pull request as follows: a2-gitusername-firstname-lastname

Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions)
---

## Your Web Application Title
Include a very brief summary of your project here.
Images are encouraged, along with concise, high-level text.

Here is a sample formula for summarizing your activities, talk about:
- the domain area the project pertains to
- the main challenges or problems the application addresses
- the key innovations that make it possible to address the problem
- the main results of the implementation, does it really address the problem?
- any additional implications of the resulting application, or possibly areas for future work that have been discovered as part of the design and implementation activities

(Note that when I use the above formula, I aim to have only one sentence per thought in order to remain concise.)

http://a2-charlieroberts.glitch.me
https://a2-rkayastha98.glitch.me/

## Technical Achievements
- **Tech Achievement 1**: Using a combination of...
- **Tech Achievement 2**: ...
- **Tech Achievement 1**: Used an html form to add in a task
- **Tech Achievement 2**: I have code to update an array on the server side every time a new task is added and then
displays the results of the current dataset in three different forms;I have code to delete an array of the server side on the click of a button for any row on
the tables, and changes the displays subsequently.

### Design/Evaluation Achievements
- **Design Achievement 1**: Shown in `style.css`, the code...
- **Design Achievement 2**: We tested the application with n=X users, finding that...
- **Design Achievement 1**: Used google fonts for the heading and the table fonts; Used css in a separate stylesheet
- **Design Achievement 2**: Used gridbox, justify-content, and align items to align all contents on the webpage; Used element selectors, id selectors, class selectors, and relative selectors for the css
30 changes: 22 additions & 8 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,28 @@ header{

}

#pBar {
background-color: #20201F;
border-radius: 5px; /* (heightOfInnerDiv / 2) + padding */
padding: 4px;
}

#prog{
background-color: darksalmon;
width: 50%;
/* Adjust with JavaScript */
height: 50px;
border-radius: 2px;
}

.tg {border-collapse:collapse;border-spacing:0;}
.tg td{border-color: lightskyblue;border-style:solid;border-width:5px;font-family:Arial, sans-serif;font-size:14px;
overflow:hidden;padding:20px 10px;word-break:normal;}
.tg th{border-color: lightskyblue;border-style:solid;border-width:5px;font-family:Arial, sans-serif;font-size:14px;
font-weight:normal;overflow:hidden;padding:20px 10px;word-break:normal;}
.tg .tg-cly1{text-align:left;vertical-align:middle}
.tg .tg-0lax{text-align:left;vertical-align:top}
.tg .tg-cly1{text-align:center;vertical-align:middle; font-family: 'Andika';font-size:15px}
.tg .tg-0lax{text-align:center;vertical-align:top;font-family: 'Andika';font-size:15px}

.tabs{
background-color: darksalmon;
color: white;
}

/* width */
::-webkit-scrollbar {
Expand All @@ -51,7 +61,7 @@ header{
/* Handle on hover */
::-webkit-scrollbar-thumb:hover {
background: #b30000;
}
}

#add_box:hover{
color: #b30000;
Expand Down Expand Up @@ -81,7 +91,11 @@ button{

.item2{
background-color: darksalmon;
align-content: center;
text-align:center;
display:flex;
align-content:space-between;
justify-content:space-between;
flex-direction:column;
width: 15vw;
margin: 15px;
box-shadow: 2px 5px 5px saddlebrown;
Expand Down
121 changes: 83 additions & 38 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<meta charset="utf-8">
<link rel="stylesheet" href="css/style.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Aclonica' rel='stylesheet'>
<link href='https://fonts.googleapis.com/css?family=Architects Daughter' rel='stylesheet'>
<link href="https://fonts.googleapis.com/css?family=Aclonica" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=ArchitectsDaughter" rel="stylesheet">
<link rel="stylesheet" href="https://www.w3schools.com/w3css/4/w3.css">
<link href="https://fonts.googleapis.com/css?family=Andika" rel="stylesheet">
</head>
<body>
<div class="grid-container">
<div class="item1">
<header>Work-<span style="font-family:Architects Daughter;color: darksalmon; font-size:110px;font-weight: bolder">Play</span> Balance</header>
<!-- <i id="addBtn" class="material-icons" style="font-size:48px;color:darksalmon;float: right">add_box</i>-->
<button id="addBtn" style="float: right">Add New</button>
<button id="addBtn" style="float: right;margin-right:15px">Add New</button>
</div>

<div class="item2">
Expand All @@ -24,19 +24,19 @@
</div>

<div class="item3" id="addBox" style="visibility: collapse; float: right">
<form action="">
<ul><label for='eventName'>*</label><input type='text' id='eventName' class="inputBoxes" placeholder="Enter event title" ></ul>
<ul><label for="eventDesc"></label><input type="text" id="eventDesc" placeholder="Enter Description"></ul>
<ul><label for="eventSTime">*</label><input type="time" id="eventSTime" class="inputBoxes" placeholder="Enter Start Time" ></ul>
<ul><label for="eventETime">*</label><input type="time" id="eventETime" class="inputBoxes" placeholder="Enter End Time" ></ul>
<ul>*<input type="radio" id="eventCategory1" name="category1" value="work"><label for="eventCategory1">Work</label>
<input type="radio" id="eventCategory2" name="category1" value="play"><label for="eventCategory2">Play</label></ul>
<form>
<input type="text" id="eventName" class="inputBoxes" placeholder="Enter event title" >*<br><br>
<input type="text" id="eventDesc" placeholder="Enter Description"><br>
Enter Start Time: *<input type="time" id="eventSTime" class="inputBoxes"><br>
Enter End Time: *<input type="time" id="eventETime" class="inputBoxes"><br><br>
<input type="radio" id="eventCategory1" name="category1" value="work"><label for="eventCategory1">Work</label>
<input type="radio" id="eventCategory2" name="category1" value="play"><label for="eventCategory2">Play</label>*<br><br>
<button id="submit">submit</button>
</form>
</div>

<div class="item4" id="mainContainer" style="background-color: white; margin: 0 auto;padding: 15px; width: 60vw;height: 60vh;overflow-y: scroll;justify-content: center">
<table id="cal" class="tg" style="table-layout: fixed; width: 756px;display: table">
<table id="cal" class="tg" style="table-layout: fixed; width: 756px; display: table">
<colgroup>
<col style="width: 178px">
<col style="width: 578px">
Expand Down Expand Up @@ -148,14 +148,14 @@
</table>

<div id="hist" style="display: none;text-align:center">
History
<table id="histTable">
<colgroup>
<col style="width: 178px">
<col style="width: 178px">
<col style="width: 178px">
<col style="width: 178px">
<col style="width: 178px">
<col style="width: 178px">
</colgroup>
<thead>
<tr>
Expand All @@ -164,20 +164,31 @@
<th class="sTime">Start Time</th>
<th class="duration">Duration</th>
<th class="type">Type</th>
</tr>
<th></th>
</tr>
</thead>
</table>
</div>
<div id="playProg" style="display: none">
<progress id="prog" value="50" max="100" style="height:100px; color: darksalmon"> 50% </progress>

<div id="playProg" style="display:none">
<div id="pBar">
<div id="prog"></div>
</div>

<h1 style="float:left">
Play
</h1>
<h1 style="float:right">
Work
</h1>
</div>

</div>
</div>
</body>
</div>

<script>
array=[23]

var play=0
var work=0
var total=0

var newName, newDesc, newSTime, newETime, newOption, duration
Expand Down Expand Up @@ -220,6 +231,7 @@
return response.json()
})
.then(function(txt){

addBox.style.visibility = 'hidden';
eName.value=""
eSTime.value=""
Expand All @@ -233,7 +245,6 @@
newETime=txt['eventETime']
newOption=txt['option']
duration=txt['duration']
total++
console.log(txt)

var tableRef = document.getElementById('histTable');
Expand All @@ -245,30 +256,42 @@
var sCell = newRow.insertCell(2);
var durCell = newRow.insertCell(3);
var typeCell = newRow.insertCell(4);
var delCell = newRow.insertCell(5);

nameCell.innerHTML=newName
descCell.innerHTML=newDesc
sCell.innerHTML=newSTime
durCell.innerHTML=duration
typeCell.innerHTML=newOption

var x = document.createElement("BUTTON");
var t = document.createTextNode("Delete");
x.style.backgroundColor="red";
x.appendChild(t);
delCell.appendChild(x);
x.addEventListener("click",function(){
myDelete(tableRef.rows.length)
})

prog.style.display='none'
hist.style.display='none'
cal.style.display="inline";


for(j=(parseInt(newSTime.substring(0,2))+1);j<(parseInt(newETime.substring(0,2))+1);j++){
var x = document.getElementById("cal").rows[j].cells;
x[1].innerHTML = newName;

if(newOption==="work"){
x[1].style.backgroundColor = "black"
work++
x[1].style.backgroundColor = "grey"
array[j]=0
}else if(newOption==="play"){
x[1].style.backgroundColor = "darkSalmon"
play++
array[j]=1
}
}

playCent=(play/total)*100



})

return false
Expand All @@ -277,23 +300,44 @@
}
}

var elem = document.getElementById("prog");


var prog=document.getElementById("playProg")
function playProg() {
work=play=1
prog.style.display='inline'
hist.style.display='none'
cal.style.display="none";
var width = elem.style.width;
setInterval(frame, 10);
function frame() {
if (width >= playCent) {
width--;
elem.style.width = width + '%';
} else {
width++;
elem.style.width = width + '%';
for (i=0; i<array.length; i++) {
if (array[i] === 0){
work++
}else if(array[i]===1){
play++
}
}

if((work!=1)&&(play!=1)){
play--
work--
}
playCent=(play/(play+work))*100

var elem = document.getElementById("prog");

elem.style.width = playCent+"%";


}

function myDelete(num){
document.getElementById("histTable").deleteRow(num-1);
body = toString(num)
fetch( '/delete', {
method:'POST',
body
})
.then( function( response ) {
return response
})
}

window.onload = function() {
Expand All @@ -304,4 +348,5 @@
</script>

<script src="js/scripts.js"></script>
</body>
</html>
Loading

0 comments on commit 8570521

Please sign in to comment.