Skip to content

Commit 2e7eed1

Browse files
KVGargKVGarg
committed
ci_build/: Re-design build-logs webpage
The newly created webpage combines the previous two webpages- info.txt and log/index.html. This web-page combines the results of both the pages and shows them in a better UI/UX with additional features of filtering and searching within the existing logs. The logs are fetched from a JSON file which is created from the logs stored in the log file _site/community.log
1 parent 323e60f commit 2e7eed1

13 files changed

Lines changed: 395 additions & 58 deletions

File tree

‎.moban.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ packages:
99
- gci
1010
- gsoc
1111
- gamification
12-
- log
12+
- ci_build
1313
- meta_review
1414
- model
1515
- twitter

‎.nocover.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nocover_file_globs:
88
- community/git.py
99
- gci/*.py
1010
- gsoc/*.py
11-
- log/*.py
11+
- ci_build/*.py
1212
- meta_review/handler.py
1313
- model/*.py
1414
- openhub/*.py

‎ci_build/view_log.py‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
import re
2+
import json
3+
import os
4+
import sys
5+
6+
from django.views.generic import TemplateView
7+
8+
from community.views import get_header_and_footer
9+
from community.git import (get_org_name,
10+
get_owner,
11+
get_deploy_url,
12+
get_upstream_deploy_url)
13+
14+
15+
class BuildLogsView(TemplateView):
16+
template_name = 'build_logs.html'
17+
18+
def get_build_info(self):
19+
data = {
20+
'Org name': get_org_name(),
21+
'Owner': get_owner(),
22+
'Deploy URL': get_deploy_url(),
23+
}
24+
try:
25+
upstream_deploy_url = get_upstream_deploy_url()
26+
data['Upstream deploy URL'] = upstream_deploy_url
27+
except RuntimeError:
28+
data['Upstream deploy URL'] = 'Not found'
29+
return dict(data)
30+
31+
def get_build_logs(self):
32+
log_lines = []
33+
log_level_specific_lines = {
34+
'INFO': [],
35+
'DEBUG': [],
36+
'WARNING': [],
37+
'ERROR': [],
38+
'CRITICAL': []
39+
}
40+
log_file_path = './_site/community.log'
41+
log_file_exists = os.path.isfile(log_file_path)
42+
if log_file_exists:
43+
with open(log_file_path) as log_file:
44+
previous_found_level = None
45+
for line in log_file:
46+
log_lines.append(line)
47+
levels = re.findall(r'\[[A-Z]+]', line)
48+
if levels:
49+
level = levels[0]
50+
level = previous_found_level = level[1:-1]
51+
log_level_specific_lines[level].append(line)
52+
elif previous_found_level:
53+
log_level_specific_lines[previous_found_level].append(
54+
line)
55+
ci_build_json = {
56+
'site_path': './_site/ci-build-detailed-logs.json',
57+
'public_path': './public/static/ci-build-detailed-logs.json',
58+
'static_path': './static/ci-build-detailed-logs.json'
59+
}
60+
with open(ci_build_json['site_path'], 'w+') as build_logs_file:
61+
data = {
62+
'logs': log_lines,
63+
'logs_level_Specific': log_level_specific_lines
64+
}
65+
json.dump(data, build_logs_file, indent=4)
66+
if os.path.isfile(ci_build_json['public_path']):
67+
if sys.platform == 'linux':
68+
os.popen('cp {} {}'.format(ci_build_json['site_path'],
69+
ci_build_json['public_path'
70+
]))
71+
os.popen('cp {} {}'.format(ci_build_json['site_path'],
72+
ci_build_json['static_path'
73+
]))
74+
else:
75+
os.popen('copy {} {}'.format(
76+
ci_build_json['site_path'],
77+
ci_build_json['public_path']))
78+
os.popen('copy {} {}'.format(
79+
ci_build_json['site_path'],
80+
ci_build_json['static_path']))
81+
82+
return True
83+
else:
84+
return False
85+
86+
def get_context_data(self, **kwargs):
87+
context = super().get_context_data(**kwargs)
88+
context = get_header_and_footer(context)
89+
context['build_info'] = self.get_build_info()
90+
context['build_logs_stored'] = self.get_build_logs()
91+
return context

‎community/urls.py‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
from django.conf.urls.static import static
77
from django.conf import settings
88

9-
from community.views import HomePageView, info
9+
from community.views import HomePageView
1010
from gci.views import index as gci_index
1111
from gci.feeds import LatestTasksFeed as gci_tasks_rss
1212
from twitter.view_twitter import index as twitter_index
13-
from log.view_log import index as log_index
13+
from ci_build.view_log import BuildLogsView
1414
from data.views import index as contributors_index
1515
from gamification.views import index as gamification_index
1616
from meta_review.views import index as meta_review_index
@@ -79,12 +79,6 @@ def get_organization():
7979
distill_func=get_index,
8080
distill_file='index.html',
8181
),
82-
distill_url(
83-
'info.txt', info,
84-
name='index',
85-
distill_func=get_index,
86-
distill_file='info.txt',
87-
),
8882
distill_url(
8983
r'gci/tasks/rss.xml', gci_tasks_rss(),
9084
name='gci-tasks-rss',
@@ -104,10 +98,10 @@ def get_organization():
10498
distill_file='twitter/index.html',
10599
),
106100
distill_url(
107-
r'log/', log_index,
108-
name='log',
101+
r'CI/Build/', BuildLogsView.as_view(),
102+
name='ci_build',
109103
distill_func=get_index,
110-
distill_file='log/index.html',
104+
distill_file='CI/Build/index.html',
111105
),
112106
distill_url(
113107
r'contributors/$', contributors_index,

‎community/views.py‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
from django.http import HttpResponse
21
from django.views.generic.base import TemplateView
32

43
from trav import Travis
54

65
from .git import (
7-
get_deploy_url,
86
get_org_name,
9-
get_owner,
10-
get_upstream_deploy_url,
117
get_remote_url
128
)
139
from data.models import Team, Contributor
@@ -110,20 +106,3 @@ def get_context_data(self, **kwargs):
110106
context['top_gamification_users'] = self.get_top_gamification_users(
111107
count=5)
112108
return context
113-
114-
115-
def info(request):
116-
data = {
117-
'Org name': get_org_name(),
118-
'Owner': get_owner(),
119-
'Deploy URL': get_deploy_url(),
120-
}
121-
try:
122-
upstream_deploy_url = get_upstream_deploy_url()
123-
data['Upstream deploy URL'] = upstream_deploy_url
124-
except RuntimeError:
125-
data['Upstream deploy URL'] = 'Not found'
126-
127-
s = '\n'.join(name + ': ' + value
128-
for name, value in data.items())
129-
return HttpResponse(s)

‎log/view_log.py‎

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

‎setup.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ testpaths =
1414
gci
1515
gsoc
1616
gamification
17-
log
17+
ci_build
1818
meta_review
1919
model
2020
twitter
@@ -70,7 +70,7 @@ source =
7070
gci
7171
gsoc
7272
gamification
73-
log
73+
ci_build
7474
meta_review
7575
model
7676
twitter
@@ -82,7 +82,7 @@ omit =
8282
community/git.py
8383
gci/*.py
8484
gsoc/*.py
85-
log/*.py
85+
ci_build/*.py
8686
meta_review/handler.py
8787
model/*.py
8888
openhub/*.py

‎static/css/build_logs.css‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
.build-info-section section,
2+
.build-logs-section section {
3+
min-width: 300px;
4+
width: 80%;
5+
}
6+
7+
.build-information,
8+
.build-logs {
9+
background-color: black;
10+
padding-left: 10px;
11+
font-weight: bold;
12+
color: white;
13+
}
14+
15+
.build-information p {
16+
font-size: 1.5em;
17+
margin: 0;
18+
}
19+
20+
.build-logs {
21+
max-height: 900px;
22+
overflow: scroll;
23+
overflow-x: hidden;
24+
overflow-y: auto;
25+
}
26+
27+
.build-logs p {
28+
margin: 0;
29+
}
30+
31+
.build-logs-section .log-chooser {
32+
width: 25%;
33+
min-width: 150px;
34+
border-radius: 100px;
35+
box-shadow: 0px 0px 25px 2px black;
36+
color: #454343;
37+
background-color: #c7da99;
38+
padding-left: 10px;
39+
margin: auto;
40+
margin-right: 0;
41+
}
42+
43+
.build-logs-section .log-chooser input,
44+
.build-logs-section .log-chooser input:focus:not(.browser-default) {
45+
border-bottom: none;
46+
margin-bottom: 0;
47+
}
48+
49+
.build-logs-section .small-screen,
50+
.build-logs-section .fa-close {
51+
display: none;
52+
}
53+
54+
.build-logs-section .section-header .form-fields {
55+
margin: auto;
56+
margin-right: 0;
57+
width: 60%;
58+
padding-top: 10px;
59+
}
60+
61+
.build-logs-section .search-field {
62+
width: 60%;
63+
min-width: 180px;
64+
border-radius: 100px;
65+
box-shadow: 0px 0px 25px 2px black;
66+
color: #454343;
67+
background-color: #edf5af;
68+
padding: 0px 20px;
69+
flex-flow: row;
70+
margin: auto;
71+
margin-left: 0;
72+
}
73+
74+
.build-logs-section input[type='search']:focus:not(.browser-default) {
75+
background-color: #edf5af;
76+
border-radius: 100px;
77+
font-size: medium;
78+
padding-left: 15px;
79+
margin-bottom: 0;
80+
}
81+
82+
.main-content h3 {
83+
color: #37474f;
84+
}
85+
86+
.section-header {
87+
display: flex;
88+
align-items: center;
89+
}
90+
91+
.section-header form {
92+
display: flex;
93+
}
94+
95+
@media only screen and (max-width: 660px) {
96+
.build-logs-section .search-field {
97+
display: none;
98+
}
99+
.build-logs-section .small-screen {
100+
display: flex;
101+
align-items: center;
102+
margin: auto;
103+
margin-right: 3px;
104+
font-size: 2em;
105+
}
106+
}
107+
108+
.webpage-name {
109+
width: 100%;
110+
}

‎static/css/index.css‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@
9797
background-color: #ee8940;
9898
}
9999

100-
.apply-flex-center {
101-
display: flex;
102-
justify-content: center;
103-
flex-flow: row wrap;
104-
align-items: center;
105-
}
106-
107100
.organization_map {
108101
text-align: center;
109102
padding: 2% 0%;

‎static/css/main.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
.apply-flex-center {
2+
display: flex;
3+
justify-content: center;
4+
flex-flow: row wrap;
5+
align-items: center;
6+
}
7+
18
body {
29
font-family: 'Ubuntu Mono', monospace;
310
background-color: #edf5af;

0 commit comments

Comments
 (0)