Skip to content

Incorporated logo #11

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

Merged
ciduarte merged 8 commits into from
Oct 10, 2019
Merged

Incorporated logo #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fda36c7
Roominder logo and favicon
amandaeze97 Oct 9, 2019
e94172c
Update README.md
amandaeze97 Oct 9, 2019
1f8ea2a
Added logo and favicon
amandaeze97 Oct 9, 2019
6e14c10
Added logo and favicon
amandaeze97 Oct 9, 2019
0a93fef
Added logo and favicon
amandaeze97 Oct 9, 2019
3ee4fb6
Added logo and favicon
amandaeze97 Oct 9, 2019
df08b03
Made 17:30 to show up for startTime
amandaeze97 Oct 9, 2019
e2340c9
Logo
Oct 10, 2019
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Team:

Our team consists of four members: Manasi Danke, Carla Duarte, Amanda-Ezeobiejesi, and Sylvia Lin.
Our team consists of four members: Manasi Danke, Carla Duarte, Amanda Ezeobiejesi, and Sylvia Lin.

## Deliverables:

Expand Down Expand Up @@ -73,4 +73,4 @@ Additional Technical/Design Achievements:
and location of their scheduled meeting.
- *Responsive Layout:* maintained a responsive layout throughout the entire website. This makes it more convenient for users to
book rooms on the go through their mobile devices.
- *Login security*: We implemented login redirect cards in order to prevent users from booking meetings if they are not logged in.
- *Login security*: We implemented login redirect cards in order to prevent users from booking meetings if they are not logged in.
4 changes: 2 additions & 2 deletions public/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta content="" name="description">

<!-- Favicons -->
<link href="img/favicon.png" rel="icon">
<link href="img/roominder_favicon.png" rel="icon">
<link href="img/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
Expand Down Expand Up @@ -38,7 +38,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="dashboard.html"><i class="fa fa-bolt"></i></a>
<a class="navbar-brand" href="dashboard.html"><img src="img/roominder.png" style="height: 60px; margin: 10px 0px;"></a>
</div>
<div class="column col-12 col-md-6 col-lg-4 col-xl-3 navbar-collapse collapse">
<div class="row justify-content-center">
Expand Down
Binary file added public/img/roominder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/roominder_favicon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/roominder_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion public/js/availability.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ function populateTimeInput() {

time = i + ":00";
times.push(time);
time = i + ":30";
times.push(time);

let selectStartTime = document.getElementById("selectStartTime");

Expand Down Expand Up @@ -514,4 +516,4 @@ window.onload = function () {
};

function main() {
}
}
4 changes: 2 additions & 2 deletions public/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta content="" name="description">

<!-- Favicons -->
<link href="img/favicon.png" rel="icon">
<link href="img/roominder_favicon.png" rel="icon">
<link href="img/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
Expand All @@ -32,7 +32,7 @@
<div id="thenavbar" class="navbar navbar-default navbar-fixed-top">
<div class="container row justify-content-start">
<div class="navbar-header column col-12 col-lg-6 col-md-6 col-xl-6">
<a class="navbar-brand" href="#"><i class="fa fa-bolt"></i></a>
<a class="navbar-brand" href="#"><img src="img/roominder.png" style="height: 60px; margin: 10px 0px;"></a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions public/meetingsDisplay.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta content="" name="description">

<!-- Favicons -->
<link href="img/favicon.png" rel="icon">
<link href="img/roominder_favicon.png" rel="icon">
<link href="img/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
Expand Down Expand Up @@ -38,7 +38,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="dashboard.html"><i class="fa fa-bolt"></i></a>
<a class="navbar-brand" href="dashboard.html"><img src="img/roominder.png" style="height: 60px; margin: 10px 0px;"></a>
</div>
<div class="column col-12 col-md-6 col-lg-4 col-xl-3 navbar-collapse collapse">
<div class="row justify-content-center">
Expand Down
4 changes: 2 additions & 2 deletions public/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta content="" name="description">

<!-- Favicons -->
<link href="img/favicon.png" rel="icon">
<link href="img/roominder_favicon.png" rel="icon">
<link href="img/apple-touch-icon.png" rel="apple-touch-icon">

<!-- Google Fonts -->
Expand Down Expand Up @@ -37,7 +37,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><i class="fa fa-bolt"></i></a>
<a class="navbar-brand" href="#"><img src="img/roominder.png" style="height: 60px; margin: 10px 0px;"></i></a>
</div>
<div class="column col-12 col-md-1 col-lg-1 col-xl-1 navbar-collapse collapse">
<div class="row justify-content-center">
Expand Down