Skip to content

Commit b8f94b2

Browse files
OdeYecOdeYec
authored
Resolved #325: Profile Page (#326)
* 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
1 parent 919f2b1 commit b8f94b2

27 files changed

+472
-603
lines changed

‎app/templates/calendar_day_view.html

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,24 @@
2020
<span class="fw-bold text-white date-nums">{{day}} / {{month}}</span>
2121
{% endif %}
2222
</div>
23+
<div class="all_day_events">
24+
{% for event in all_day_events %}
25+
<p class="text-truncate my-0 {{size}}">{{ event.title }}</p>
26+
{% endfor %}
27+
</div>
2328
<div class="schedule">
2429
<div class="container times bg-primeary position">
25-
{% for hour in range(25)%}
26-
<div class='hour-block'>
27-
<div class="row bg-transparent hour-mark">
28-
{% if view == 'day'%}
29-
{% set hour = hour|string() %}
30-
{{hour.zfill(2)}}:00
31-
{% endif %}
32-
</div>
33-
<div class="hour-bar row text-white border-bottom"></div>
34-
</div>
35-
{% endfor %}
30+
{% for hour in range(25)%}
31+
<div class='hour-block'>
32+
<div class="row bg-transparent hour-mark">
33+
{% if view == 'day'%}
34+
{% set hour = hour|string() %}
35+
{{hour.zfill(2)}}:00
36+
{% endif %}
37+
</div>
38+
<div class="hour-bar row text-white border-bottom"></div>
39+
</div>
40+
{% endfor %}
3641
</div>
3742
<div class="event-grid">
3843
{% for event, attr in events %}
@@ -56,14 +61,15 @@
5661
</div>
5762
{% endfor %}
5863
</div>
59-
</div>
64+
</div>
6065
{% if view == 'day'%}
6166
<button title="Add Event" class="event-btn add-event-icon">
6267
<ion-icon name="add"></ion-icon>
6368
</button>
6469
{% endif %}
6570
</div>
66-
{% if view == 'day'%}<div id="event_block"></div>{% endif %}
71+
{% if view == 'day'%}
72+
<div id="event_block"></div>{% endif %}
6773
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
6874
integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
6975
crossorigin="anonymous"></script>

‎app/templates/dayview.html

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎app/templates/event/partials/edit_event_details_tab.html

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎app/templates/partials/calendar/event/edit_event_details_tab.html

Lines changed: 82 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,95 @@
11
<div class="form_row">
2-
<input id="say" type="text" name="title" placeholder="Event Title" required>
3-
<input type="button" id="speak" name="speak" value="Speak it!">
4-
</div>
5-
<div>
6-
<!-- Voices gets its own row for being so wide! -->
7-
<div class="field" id="voices">
8-
<label for="voice">Voice</label>
9-
<select id="voice" name="voice"></select>
10-
</div>
11-
</div>
12-
<div class="form_row panel">
13-
<div class="field">
14-
<label for="volume">Volume</label>
15-
<input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
16-
<output for="volume"></output>
17-
</div>
18-
<div class="field">
19-
<label for="pitch">Pitch</label>
20-
<input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
21-
<output for="pitch"></output>
22-
</div>
23-
<div class="field">
24-
<label for="rate">Rate</label>
25-
<input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
26-
<output for="rate"></output>
27-
</div>
2+
<input id="say" type="text" name="title" placeholder="Event Title" required>
3+
<input type="button" id="speak" name="speak" value="Speak it!">
4+
</div
5+
>
6+
<div class="form_row">
7+
<div class="field" id="voices">
8+
<label for="voice">Voice</label>
9+
<select id="voice" name="voice"></select>
10+
</div>
11+
<div class="field">
12+
<label for="volume">Volume</label>
13+
<input type="range" id="volume" name="volume" min="0" max="1" step="0.01" value="0.5">
14+
<output for="volume"></output>
15+
</div>
16+
<div class="field">
17+
<label for="pitch">Pitch</label>
18+
<input type="range" id="pitch" name="pitch" min="0" max="2" step="0.01" value="1">
19+
<output for="pitch"></output>
20+
</div>
21+
<div class="field">
22+
<label for="rate">Rate</label>
23+
<input type="range" id="rate" name="rate" min="0.1" max="10" step="0.1" value="1">
24+
<output for="rate"></output>
25+
</div>
2826
</div>
27+
2928
<div class="form_row">
30-
<label for="start_date">Start Date:</label>
31-
<input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
32-
<label for="start_time">Start Time:</label>
33-
<input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
29+
<label for="start_date">Start Date:</label>
30+
<input id="start_date" type="date" name="start_date" placeholder="Start Date" required>
31+
<label for="start_time">Start Time:</label>
32+
<input id="start_time" type="time" name="start_time" placeholder="Start Time" required>
3433
</div>
34+
3535
<div class="form_row">
36-
<label for="end_date">End Date:</label>
37-
<input id="end_date" type="date" name="end_date" placeholder="End Date" required>
38-
<label for="end_time">End Time:</label>
39-
<input id="end_time" type="time" name="end_time" placeholder="End Time" required>
36+
<label for="end_date">End Date:</label>
37+
<input id="end_date" type="date" name="end_date" placeholder="End Date" required>
38+
<label for="end_time">End Time:</label>
39+
<input id="end_time" type="time" name="end_time" placeholder="End Time" required>
4040
</div>
41+
4142
<div class="form_row">
42-
<label for="location_type">Location Type:</label>
43-
<select id="location_type" name="location_type" required>
44-
<option value="" disabled selected>Type</option>
45-
<option value="vc_url">VC URL</option>
46-
<option value="address">Address</option>
47-
</select>
48-
<input type="text" name="location" placeholder="VC URL/Location">
43+
<label for="location_type">Location Type:</label>
44+
<select id="location_type" name="location_type" required>
45+
<option value="" disabled selected>Type</option>
46+
<option value="vc_url">VC URL</option>
47+
<option value="address">Address</option>
48+
</select>
49+
<input type="text" name="location" placeholder="VC URL/Location">
4950
</div>
51+
5052
<div class="form_row textarea">
51-
<textarea id="say" name="description" placeholder="Description"></textarea>
53+
<textarea id="say" name="description" placeholder="Description"></textarea>
54+
</div>
55+
56+
<div class="form_row">
57+
<label for="event_type">All-day:</label>
58+
<select id="event_type" name="event_type" required>
59+
<option value="on">Yes</option>
60+
<option value="off" selected>No</option>
61+
</select>
5262
</div>
63+
5364
<div class="form_row">
54-
<div class="form_row_start">
55-
<label for="color">Color:</label>
56-
<select id="color" name="color">
57-
<option value="red">Red</option>
58-
<option value="green">Green</option>
59-
<option value="blue">Blue</option>
60-
</select>
61-
</div>
62-
<div class="form_row_end">
63-
<label for="availability">Availability:</label>
64-
<select id="availability" name="availability">
65-
<option value="free">Free</option>
66-
<option value="busy" selected>Busy</option>
67-
</select>
68-
<label for="privacy">Privacy:</label>
69-
<select id="privacy" name="privacy">
70-
<option value="private">Private</option>
71-
<option value="public" selected>Public</option>
72-
</select>
73-
</div>
65+
<div class="form_row_start">
66+
<label for="color">Color:</label>
67+
<select id="color" name="color">
68+
<option value="red">Red</option>
69+
<option value="green">Green</option>
70+
<option value="blue">Blue</option>
71+
</select>
72+
</div>
73+
74+
<div class="form_row_end">
75+
<label for="availability">Availability:</label>
76+
<select id="availability" name="availability">
77+
<option value="free">Free</option>
78+
<option value="busy" selected>Busy</option>
79+
</select>
80+
81+
<label for="privacy">Privacy:</label>
82+
<select id="privacy" name="privacy">
83+
<option value="private">Private</option>
84+
<option value="public" selected>Public</option>
85+
</select>
86+
87+
<label for="is_google_event">Google event:</label>
88+
<select id="is_google_event" name="is_google_event">
89+
<option value="True">Yes</option>
90+
<option value="False" selected>No</option>
91+
</select>
92+
93+
</div>
7494
</div>
7595

‎app/templates/partials/user_profile/middle_content.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<div class="col-5">
2+
<div class="container card mb-2 pb-0" id="daily_horoscope">
3+
</div>
4+
<!-- Upcoming events -->
5+
<div class="mb-3">
6+
{% for event in events %}
7+
<!-- Event card -->
8+
{% include 'partials/user_profile/middle_content/event_card.html' %}
9+
10+
{% include 'partials/user_profile/middle_content/update_event_modal.html' %}
11+
{% endfor %}
12+
</div>
13+
</div>

0 commit comments

Comments
 (0)