Skip to content

Welcome and calculator fix #1

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
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Welcome and calculator fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e7b4cd
added an incorrect course code
Dhruv-A May 19, 2024
f9c8ba2
fixed typo
Dhruv-A May 19, 2024
b3b2024
Merge remote-tracking branch 'origin' into incorrect_branch_name
Dhruv-A May 19, 2024
6f3962f
added some required additional info
Dhruv-A May 19, 2024
a06c7b4
Add COMP9900 in the welcome message
Sep 25, 2024
a22e9e8
Fix multiplication bug to addition as required
Sep 25, 2024
a0b90a7
Fix merge issue as required by the spec
Sep 25, 2024
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 templates/calculator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1>Calculator</h1>
function solve() {
const num1 = parseFloat(document.getElementById('num1').value);
const num2 = parseFloat(document.getElementById('num2').value);
const result = num1 * num2;
const result = num1 + num2;
document.getElementById('result').textContent = 'Result: ' + result;
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Welcome</title>
</head>
<body>
<h1>Welcome to COMP3900</h1>
<h1>Welcome to COMP3900/COMP9900</h1>
<button onclick="window.location.href='/calculator'">Go to Calculator</button>
</body>
</html>