Skip to content

Week View: Bold Day of Week #28

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
merged 3 commits into from
May 11, 2019
Merged

Week View: Bold Day of Week #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ed8bca
JS: Combine two for loops for identifying which week to append days to
May 11, 2019
836a190
JS: Added getMonths() getDays(), Week View now bolds current day
May 11, 2019
d566aa2
CSS: Add styles for week.today to bold current day in week view
May 11, 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
41 changes: 26 additions & 15 deletions custom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,36 +150,39 @@
// Display Meetup Data in Week View
function listMeetupsinWeekView(data) {

let today = new Date();
let weekdays = getDays();
let days = data.days;
let meetups = data.results;

let meetupsByDay = getWeekFormattedMeetups(meetups);

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@itsevalieu I combined your two for loops into one.

for(let i=0; i <= 6; i++) {
let week1div = '<div class="day" id="' + days[i].dow.toLowerCase() + days[i].date + '"></div>';
document.querySelector('#firstweek').insertAdjacentHTML('beforeend', week1div);
}

for(let i=7; i <= 13; i++) {
let week2div = '<div class="day" id="' + days[i].dow.toLowerCase() + days[i].date + '"></div>';
document.querySelector('#secondweek').insertAdjacentHTML('beforeend', week2div);
// 14 days, 0-indexed
for(let i=0; i < 14; i++) {
// Determine which week we're on
let weekid = ( i<7 ) ? 'first' : 'second';
let weekdiv = '<div class="day" id="' + days[i].dow.toLowerCase() + days[i].date + '"></div>';
document.querySelector('#' + weekid + 'week').insertAdjacentHTML('beforeend', weekdiv);
}

for(let i=0; i < days.length; i++) {
let weekday = days[i];
let dowDay = weekday.dow.substring(0,3) + weekday.date;
let meetupString = meetupsByDay[dowDay];
let formattedWeek = '<div class="weekday">'
let isToday = ( (weekdays[today.getDay()].substring(0, 3) + today.getDate()) == dowDay )? " today" : "";
let formattedWeek = '<div class="weekday'+ isToday + '">'
+ weekday.dow.substring(0,3) + ' '
+ weekday.month.substring(0,3) + ' '
+ weekday.date
+ '</div>';
// If meetups exist
if(meetupString) {
formattedWeek += meetupString.join('');

// Otherwise indicate no meetups for the day
} else {
formattedWeek += '<div class="week-meetup-none">No meetups!</div';
}
}
// Append to weekday
$('#' + weekday.dow.toLowerCase() + weekday.date).append(formattedWeek);
}
}
Expand Down Expand Up @@ -243,8 +246,8 @@

// Get Week Range
function getCurrentDates(numOfWeeks) {
const weekdays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
const months = getMonths();
const weekdays = getDays();
let numOfDays = numOfWeeks * 7;
let days = [];
let today = new Date;
Expand All @@ -264,8 +267,8 @@

}
function getDateFormats(meetup) {
const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
const weekdays = ['Sunday','Monday','Tueday','Wednesday','Thursday','Friday','Saturday'];
const months = getMonths();
const weekdays = getDays();
const dt = new Date(meetup.time);

// Setup event date info
Expand All @@ -285,6 +288,14 @@
return d;
}

function getMonths() {
return ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
}

function getDays() {
return ['Sunday','Monday','Tueday','Wednesday','Thursday','Friday','Saturday'];
}

function formatAMPM(date) {
let hours = date.getHours();
let minutes = date.getMinutes();
Expand Down
3 changes: 3 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ section {
text-overflow: ellipsis;
overflow: hidden;
}
.weekday.today {
font-weight: bold;
}
.week-meetup, .week-meetup-none {
border: 1px solid #b74949;
border-radius: 5px;
Expand Down