Skip to content

Commit

Permalink
Resolved #325: Profile Page (#326)
Browse files Browse the repository at this point in the history 
* fixed bugs in the user profile page

* class and id name fixes

* dev: fixed an issue in edit_event_details_tab.html due to conflicts

* dev: fixed an issue in calendar_day_view.html due to conflicts
  • Loading branch information
@OdeYec
OdeYec authored Feb 20, 2021
1 parent 919f2b1 commit b8f94b2
Show file tree
Hide file tree
Showing 27 changed files with 472 additions and 603 deletions.
32 changes: 19 additions & 13 deletions app/templates/calendar_day_view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,24 @@
<span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
{% endif %}
</div>
<div class="all_day_events">
{% for event in all_day_events %}
<p class="text-truncate my-0 {{size}}">{{ event.title }}</p>
{% endfor %}
</div>
<div class="schedule">
<div class="container times bg-primeary position">
{% for hour in range(25)%}
<div class='hour-block'>
<div class="row bg-transparent hour-mark">
{% if view == 'day'%}
{% set hour = hour|string() %}
{{hour.zfill(2)}}:00
{% endif %}
</div>
<div class="hour-bar row text-white border-bottom"></div>
</div>
{% endfor %}
{% for hour in range(25)%}
<div class='hour-block'>
<div class="row bg-transparent hour-mark">
{% if view == 'day'%}
{% set hour = hour|string() %}
{{hour.zfill(2)}}:00
{% endif %}
</div>
<div class="hour-bar row text-white border-bottom"></div>
</div>
{% endfor %}
</div>
<div class="event-grid">
{% for event, attr in events %}
Expand All @@ -56,14 +61,15 @@
</div>
{% endfor %}
</div>
</div>
</div>
{% if view == 'day'%}
<button title="Add Event" class="event-btn add-event-icon">
<ion-icon name="add"></ion-icon>
</button>
{% endif %}
</div>
{% if view == 'day'%}<div id="event_block"></div>{% endif %}
{% if view == 'day'%}
<div id="event_block"></div>{% endif %}
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
crossorigin="anonymous"></script>
Expand Down
75 changes: 0 additions & 75 deletions app/templates/dayview.html
View file

This file was deleted.

86 changes: 0 additions & 86 deletions app/templates/event/partials/edit_event_details_tab.html
View file

This file was deleted.

144 changes: 82 additions & 62 deletions app/templates/partials/calendar/event/edit_event_details_tab.html
View file
Original file line number Diff line number Diff line change
@@ -1,75 +1,95 @@
<div class="form_row">
<input id="say" type="text" name="title" placeholder="Event Title" required>
<input type="button" id="speak" name="speak" value="Speak it!">
</div>
<div>
<!-- Voices gets its own row for being so wide! -->
<div class="field" id="voices">
<label for="voice">Voice</label>
<select id="voice" name="voice"></select>
</div>
</div>
<div class="form_row panel">
<div class="field">
<label for="volume">Volume</label>
<input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
<output for="volume"></output>
</div>
<div class="field">
<label for="pitch">Pitch</label>
<input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
<output for="pitch"></output>
</div>
<div class="field">
<label for="rate">Rate</label>
<input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
<output for="rate"></output>
</div>
<input id="say" type="text" name="title" placeholder="Event Title" required>
<input type="button" id="speak" name="speak" value="Speak it!">
</div
>
<div class="form_row">
<div class="field" id="voices">
<label for="voice">Voice</label>
<select id="voice" name="voice"></select>
</div>
<div class="field">
<label for="volume">Volume</label>
<input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
<output for="volume"></output>
</div>
<div class="field">
<label for="pitch">Pitch</label>
<input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
<output for="pitch"></output>
</div>
<div class="field">
<label for="rate">Rate</label>
<input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
<output for="rate"></output>
</div>
</div>

<div class="form_row">
<label for="start_date">Start Date:</label>
<input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
<label for="start_time">Start Time:</label>
<input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
<label for="start_date">Start Date:</label>
<input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
<label for="start_time">Start Time:</label>
<input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
</div>

<div class="form_row">
<label for="end_date">End Date:</label>
<input id="end_date" type="date" name="end_date" placeholder="End Date" required>
<label for="end_time">End Time:</label>
<input id="end_time" type="time" name="end_time" placeholder="End Time" required>
<label for="end_date">End Date:</label>
<input id="end_date" type="date" name="end_date" placeholder="End Date" required>
<label for="end_time">End Time:</label>
<input id="end_time" type="time" name="end_time" placeholder="End Time" required>
</div>

<div class="form_row">
<label for="location_type">Location Type:</label>
<select id="location_type" name="location_type" required>
<option value="" disabled selected>Type</option>
<option value="vc_url">VC URL</option>
<option value="address">Address</option>
</select>
<input type="text" name="location" placeholder="VC URL/Location">
<label for="location_type">Location Type:</label>
<select id="location_type" name="location_type" required>
<option value="" disabled selected>Type</option>
<option value="vc_url">VC URL</option>
<option value="address">Address</option>
</select>
<input type="text" name="location" placeholder="VC URL/Location">
</div>

<div class="form_row textarea">
<textarea id="say" name="description" placeholder="Description"></textarea>
<textarea id="say" name="description" placeholder="Description"></textarea>
</div>

<div class="form_row">
<label for="event_type">All-day:</label>
<select id="event_type" name="event_type" required>
<option value="on">Yes</option>
<option value="off" selected>No</option>
</select>
</div>

<div class="form_row">
<div class="form_row_start">
<label for="color">Color:</label>
<select id="color" name="color">
<option value="red">Red</option>
<option value="green">Green</option>
<option value="blue">Blue</option>
</select>
</div>
<div class="form_row_end">
<label for="availability">Availability:</label>
<select id="availability" name="availability">
<option value="free">Free</option>
<option value="busy" selected>Busy</option>
</select>
<label for="privacy">Privacy:</label>
<select id="privacy" name="privacy">
<option value="private">Private</option>
<option value="public" selected>Public</option>
</select>
</div>
<div class="form_row_start">
<label for="color">Color:</label>
<select id="color" name="color">
<option value="red">Red</option>
<option value="green">Green</option>
<option value="blue">Blue</option>
</select>
</div>

<div class="form_row_end">
<label for="availability">Availability:</label>
<select id="availability" name="availability">
<option value="free">Free</option>
<option value="busy" selected>Busy</option>
</select>

<label for="privacy">Privacy:</label>
<select id="privacy" name="privacy">
<option value="private">Private</option>
<option value="public" selected>Public</option>
</select>

<label for="is_google_event">Google event:</label>
<select id="is_google_event" name="is_google_event">
<option value="True">Yes</option>
<option value="False" selected>No</option>
</select>

</div>
</div>

13 changes: 13 additions & 0 deletions app/templates/partials/user_profile/middle_content.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="col-5">
<div class="container card mb-2 pb-0" id="daily_horoscope">
</div>
<!-- Upcoming events -->
<div class="mb-3">
{% for event in events %}
<!-- Event card -->
{% include 'partials/user_profile/middle_content/event_card.html' %}

{% include 'partials/user_profile/middle_content/update_event_modal.html' %}
{% endfor %}
</div>
</div>
Loading

0 comments on commit b8f94b2

Please sign in to comment.