Skip to content

Commit fe981c6

Browse files
codeIntrovertcodeIntrovert
committed
code modular update, structure changes to data.py
1 parent d877f54 commit fe981c6

File tree

8 files changed

+146
-126
lines changed

8 files changed

+146
-126
lines changed

‎__pycache__/data.cpython-311.pyc‎

1.15 KB
Binary file not shown.

‎app.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
from flask import Flask, render_template
22
import data
3+
34
app = Flask(__name__)
45

56
@app.route('/')
67
def index():
78
beginner = data.beginner
89
lecturesData = data.lecturesData
9-
return render_template('index.html', beginner=beginner, lecturesData=lecturesData )
10+
return render_template('index.html', beginner=beginner, lecturesData=lecturesData)
1011

1112
@app.route('/browse')
1213
def browse():
1314
beginner = data.beginner
14-
advance = data.advance
15-
return render_template('browse.html', beginner=beginner, advance=advance)
15+
advanced = data.advanced
16+
return render_template('browse.html', beginner=beginner, advanced=advanced)
1617

1718
@app.route('/myCourses')
1819
def myCourses():
19-
#pass course details here
20+
# pass course details here
2021
return render_template('details.html')
2122

2223
@app.route('/details')
2324
def details():
2425
course = data.course
2526
lecturesData = data.lecturesData
26-
return render_template('details.html', course=course, lecturesData=lecturesData)
27+
beginner = data.beginner
28+
advanced = data.advanced
29+
return render_template('details.html', course=course, lecturesData=lecturesData, beginner=beginner)
2730

2831
@app.route('/profile')
2932
def profile():
30-
return render_template('profile.html' )
33+
return render_template('profile.html')
3134

3235
@app.route('/login')
3336
def login():
3437
return render_template('login.html')
3538

39+
#@app.errorhandler(404)
3640
def page_not_found(e):
3741
error = e
3842
return render_template('error.html', errorCode=error), 404

‎data.py‎

Lines changed: 88 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,94 @@
1-
beginner = [ # keep it in multiples of 4 for optimal design
2-
('HTML', 'Free','4.8', '#','popular-02.jpg'),
3-
('CSS','Free','5.0','#','popular-01.jpg'),
4-
('JavaScript', '$4.99','4.8', '#','popular-04.jpg'),
5-
('AWS Basics','Free','5.0','#','popular-03.jpg')
6-
#('CourseName', 'Price/Free','rating','link','imageName')
1+
beginner = [
2+
{
3+
'courseName': 'HTML',
4+
'price': 'Free',
5+
'rating': '4.8',
6+
'link': '#',
7+
'imageName': 'popular-02.jpg'
8+
},
9+
{
10+
'courseName': 'CSS',
11+
'price': 'Free',
12+
'rating': '5.0',
13+
'link': '#',
14+
'imageName': 'popular-01.jpg'
15+
},
16+
{
17+
'courseName': 'JavaScript',
18+
'price': '$4.99',
19+
'rating': '4.8',
20+
'link': '#',
21+
'imageName': 'popular-04.jpg'
22+
},
23+
{
24+
'courseName': 'AWS Basics',
25+
'price': 'Free',
26+
'rating': '5.0',
27+
'link': '#',
28+
'imageName': 'popular-03.jpg'
29+
}
730
]
8-
advance = [
9-
('Django', 'Free','4.8', '#','popular-01.jpg'),
10-
('Numpy','$4.99','5.0','#','popular-02.jpg'),
11-
('Big Data','$4.99','5.0','#','popular-03.jpg'),
12-
('C#','$4.99','5.0','#','popular-04.jpg')
31+
32+
advanced = [
33+
{
34+
'courseName': 'Django',
35+
'price': 'Free',
36+
'rating': '4.8',
37+
'link': '#',
38+
'imageName': 'popular-01.jpg'
39+
},
40+
{
41+
'courseName': 'Numpy',
42+
'price': '$4.99',
43+
'rating': '5.0',
44+
'link': '#',
45+
'imageName': 'popular-02.jpg'
46+
},
47+
{
48+
'courseName': 'Big Data',
49+
'price': '$4.99',
50+
'rating': '5.0',
51+
'link': '#',
52+
'imageName': 'popular-03.jpg'
53+
},
54+
{
55+
'courseName': 'C#',
56+
'price': '$4.99',
57+
'rating': '5.0',
58+
'link': '#',
59+
'imageName': 'popular-04.jpg'
60+
}
1361
]
62+
1463
lecturesData = [
15-
('HTML/CSS','ReactJS','23/Feb','1 Hour','Free'),
16-
('JavaScript','ReactJS','23/Feb','2 Hour','Free'),
17-
('UI/UX','ReactJS','23/Feb','1.6 Hour','$10')
64+
{
65+
'courseName': 'HTML/CSS',
66+
'topic': 'ReactJS',
67+
'date': '23/Feb',
68+
'duration': '1 Hour',
69+
'price': 'Free'
70+
},
71+
{
72+
'courseName': 'JavaScript',
73+
'topic': 'ReactJS',
74+
'date': '23/Feb',
75+
'duration': '2 Hour',
76+
'price': 'Free'
77+
},
78+
{
79+
'courseName': 'UI/UX',
80+
'topic': 'ReactJS',
81+
'date': '23/Feb',
82+
'duration': '1.6 Hour',
83+
'price': '$10'
84+
}
1885
]
86+
1987
course = {
20-
'Name': 'ReactJS',
21-
'Difficulty': 'Intermediate',
22-
'Duration': '1 week',
23-
'Rating':'5.0',
88+
'name': 'ReactJS',
89+
'difficulty': 'Intermediate',
90+
'duration': '1 week',
91+
'rating': '5.0',
92+
'price': 'Free',
2493
'description': 'ReactJS is a powerful, efficient and user-friendly JavaScript library for building interactive interfaces.'
25-
}
94+
}

‎templates/details.html‎

Lines changed: 30 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{% extends 'layout.html' %}
2-
{% from 'macros/lectures.html' import lecture_list %}
32
{% block content %}
43

54
<!-- ***** Details Start ***** -->
65
<div class="game-details">
76
<div class="row">
87
<div class="col-lg-12" style="margin-top: -8vh; text-align:center;">
98
<h2>
10-
<i class="devicon-react-original colored" style="font-size: 35px; margin-left:-10px;"></i> {{course.Name}}</h2>
11-
12-
9+
<i class="devicon-react-original colored" style="font-size: 35px; margin-left:-10px;"></i> {{ course['name'] }}</h2>
1310
</div>
1411
<div class="col-lg-12">
1512
<div class="content">
@@ -18,16 +15,16 @@ <h2>
1815
<div class="left-info">
1916
<ul style="text-align: center;">
2017
<li>
21-
{{course.description}}
18+
{{ course['description'] }}
2219
</li>
2320
</ul>
2421
</div>
2522
<div class="right-info">
2623
<ul>
27-
<li><i class="fa fa-star star"></i> 4.8 </li>
28-
<li><i class="fa fa-clock"></i>{{course.Duration}}</li>
29-
<li><i class="fa fa-circle-check"></i> Free </li>
30-
<li><i class="fa fa-microchip"></i>{{course.Difficulty}}</li>
24+
<li><i class="fa fa-star star"></i>{{ course['rating'] }}</li>
25+
<li><i class="fa fa-clock"></i>{{ course['duration'] }}</li>
26+
<li><i class="fa fa-circle-check"></i> {{ course['price'] }}</li>
27+
<li><i class="fa fa-microchip"></i>{{ course['difficulty'] }}</li>
3128
</ul>
3229
</div>
3330
</div>
@@ -47,84 +44,34 @@ <h4># <em>Lectures</em></h4>
4744
</div>
4845
</div>
4946
<!-- ***** Gaming Library End ***** -->
50-
</div>
51-
</div>
52-
</div>
53-
</div>
54-
</div>
55-
<!-- ***** Details End ***** -->
47+
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
53+
<!-- ***** Other Start ***** -->
54+
<div class="most-popular">
55+
<div class="row">
56+
<div class="col-lg-12">
57+
<div class="heading-section">
58+
<h4>#<em> Related</em> Courses</h4>
59+
</div>
60+
<div class="row">
5661

57-
<!-- ***** Other Start ***** -->
58-
<div class="other-games">
59-
<div class="row">
60-
<div class="col-lg-12">
61-
<div class="heading-section">
62-
<h4><em>Other Related</em> Games</h4>
63-
</div>
64-
</div>
65-
<div class="col-lg-6">
66-
<div class="item">
67-
<img src="{{ url_for('static', filename='assets/images/game-01.jpg') }}" alt="" class="templatemo-item">
68-
<h4>Dota 2</h4><span>Sandbox</span>
69-
<ul>
70-
<li><i class="fa fa-star"></i> 4.8</li>
71-
<li><i class="fa fa-download"></i> 2.3M</li>
72-
</ul>
73-
</div>
74-
</div>
75-
<div class="col-lg-6">
76-
<div class="item">
77-
<img src="{{ url_for('static', filename='assets/images/game-02.jpg') }}" alt="" class="templatemo-item">
78-
<h4>Dota 2</h4><span>Sandbox</span>
79-
<ul>
80-
<li><i class="fa fa-star"></i> 4.8</li>
81-
<li><i class="fa fa-download"></i> 2.3M</li>
82-
</ul>
83-
</div>
84-
</div>
85-
<div class="col-lg-6">
86-
<div class="item">
87-
<img src="{{ url_for('static', filename='assets/images/game-03.jpg') }}" alt="" class="templatemo-item">
88-
<h4>Dota 2</h4><span>Sandbox</span>
89-
<ul>
90-
<li><i class="fa fa-star"></i> 4.8</li>
91-
<li><i class="fa fa-download"></i> 2.3M</li>
92-
</ul>
93-
</div>
94-
</div>
95-
<div class="col-lg-6">
96-
<div class="item">
97-
<img src="{{ url_for('static', filename='assets/images/game-02.jpg') }}" alt="" class="templatemo-item">
98-
<h4>Dota 2</h4><span>Sandbox</span>
99-
<ul>
100-
<li><i class="fa fa-star"></i> 4.8</li>
101-
<li><i class="fa fa-download"></i> 2.3M</li>
102-
</ul>
103-
</div>
104-
</div>
105-
<div class="col-lg-6">
106-
<div class="item">
107-
<img src="{{ url_for('static', filename='assets/images/game-03.jpg') }}" alt="" class="templatemo-item">
108-
<h4>Dota 2</h4><span>Sandbox</span>
109-
<ul>
110-
<li><i class="fa fa-star"></i> 4.8</li>
111-
<li><i class="fa fa-download"></i> 2.3M</li>
112-
</ul>
113-
</div>
114-
</div>
115-
<div class="col-lg-6">
116-
<div class="item">
117-
<img src="{{ url_for('static', filename='assets/images/game-01.jpg') }}" alt="" class="templatemo-item">
118-
<h4>Dota 2</h4><span>Sandbox</span>
119-
<ul>
120-
<li><i class="fa fa-star"></i> 4.8</li>
121-
<li><i class="fa fa-download"></i> 2.3M</li>
122-
</ul>
123-
</div>
62+
<!--macro from here-->
63+
{{ project_list(beginner) }}
64+
<!-- macro ends -->
65+
66+
<div class="col-lg-12">
67+
<div class="main-button">
68+
<a href="{{ url_for('browse') }}">Discover Popular</a>
12469
</div>
12570
</div>
12671
</div>
12772
</div>
12873
</div>
74+
</div>
12975
<!-- ***** Other End ***** -->
130-
{% endblock %}
76+
77+
{% endblock %}

‎templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{% from 'macros/menu.html' import project_list %}
2-
{% from 'macros/lectures.html' import lecture_list %}
31
{% extends 'layout.html' %}
42

53
{% block content %}
@@ -17,6 +15,8 @@ <h4>#<em> Popular</em> Courses</h4>
1715

1816
<!--macro from here-->
1917
{{ project_list(beginner) }}
18+
<!-- macro ends -->
19+
2020
<div class="col-lg-12">
2121
<div class="main-button">
2222
<a href="{{ url_for('browse') }}">Discover Popular</a>

‎templates/layout.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
{% from 'macros/menu.html' import project_list %}
4+
{% from 'macros/lectures.html' import lecture_list %}
35

46
<head>
57

@@ -33,6 +35,7 @@
3335

3436
<body>
3537

38+
3639
<!-- ***** Preloader Start ***** -->
3740
<div id="js-preloader" class="js-preloader">
3841
<div class="preloader-inner">

‎templates/macros/lectures.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
<!--lecture macro-->
21

32
{% macro lecture_list(data) %}
43

54
{% for lecture in data %}
65
<div class="item">
76
<ul>
87
<li><img src="{{ url_for('static', filename='assets/images/game-02.jpg') }}" alt="" class="templatemo-item"></li>
9-
<li><h4>{{lecture[0]}}</h4><span>{{lecture[1]}}</span></li>
10-
<li><h4>Date Added</h4><span>{{lecture[2]}}</span></li>
11-
<li><h4>Duration</h4><span>{{lecture[3]}}</span></li>
12-
<li><h4>Price</h4><span>{{lecture[4]}}</span></li>
8+
<li><h4>{{ lecture['courseName'] }}</h4><span>{{ lecture['topic'] }}</span></li>
9+
<li><h4>Date Added</h4><span>{{ lecture['date'] }}</span></li>
10+
<li><h4>Duration</h4><span>{{ lecture['duration'] }}</span></li>
11+
<li><h4>Price</h4><span>{{ lecture['price'] }}</span></li>
1312
<li><div class="main-border-button"><a href="#">Watch</a></div></li>
1413
</ul>
1514
</div>

‎templates/macros/menu.html‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
{% macro project_list(data) %}
2-
3-
{% for project in data %}
4-
<div class="col-lg-3 col-sm-6">
5-
<div class="item">
6-
<img src="{{ url_for('static', filename='assets/images/' ~ project[4]) }}" alt="">
7-
<h4>{{project[0]}}<br><span>{{project[1]}}</span></h4>
2+
{% for project in data %}
3+
<div class="col-lg-3 col-sm-6">
4+
<div class="item">
5+
<img src="{{ url_for('static', filename='assets/images/' ~ project['imageName']) }}" alt="">
6+
<h4>{{ project['courseName'] }}<br><span>{{ project['price'] }}</span></h4>
87
<ul>
9-
<li><i class="fa fa-star star"></i> {{project[2]}}</li>
10-
<li><i class="fa fa-bookmark star"></i></li>
8+
<li><i class="fa fa-star star"></i> {{ project['rating'] }}</li>
9+
<li><i class="fa fa-bookmark star"></i></li>
1110
</ul>
11+
</div>
1212
</div>
13-
</div>
14-
{% endfor %}
15-
13+
{% endfor %}
1614
{% endmacro %}

0 commit comments

Comments
 (0)