stupidcomputer
/
yig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: stupidcomputer:62b13cd684b709fee2d5722e71aa33ff700bfea0
Branches Tags
stupidcomputer:main
stupidcomputer:pending_documentation
stupidcomputer:django-based
stupidcomputer:original-main
stupidcomputer:devel
stupidcomputer:client-side
..
compare: stupidcomputer:79d441d1f650f13cae7fe110c33473bffe01942e
Branches Tags
stupidcomputer:main
stupidcomputer:pending_documentation
stupidcomputer:django-based
stupidcomputer:original-main
stupidcomputer:devel
stupidcomputer:client-side

No commits in common. "62b13cd684b709fee2d5722e71aa33ff700bfea0" and "79d441d1f650f13cae7fe110c33473bffe01942e" have entirely different histories.
62b13cd684 ... 79d441d1f6

14 changed files with 42 additions and 140 deletions
Show Stats Expand all files Collapse all files

19
franklincce/explorer/models.py
View File

@ -112,22 +112,3 @@ class LegislativeText(models.Model):
def get_lines(self): def get_lines(self):
cls = namedtuple('LegLine', ['linenumber', 'linetext']) cls = namedtuple('LegLine', ['linenumber', 'linetext'])
return [cls(i + 1, j) for i, j in enumerate(self.text.split('\n'))] return [cls(i + 1, j) for i, j in enumerate(self.text.split('\n'))]
def is_bill(self):
if self.assembly in [
"RHB",
"BHB",
"WHB",
"RSB",
"BSB",
"WSB",
"SEN",
"HOU",
]:
return True
return False
def is_resolution(self):
if self.assembly in ["RGA", "BGA", "WGA", "GEN"]:
return True
return False

4
franklincce/explorer/templates/explorer/all.html
View File

@ -1,9 +1,8 @@
{% extends "explorer/base.html" %} {% extends "explorer/base.html" %}
{% block content %} {% block content %}
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
<div class="boxed">
<h1>All legislative texts</h1> <h1>All legislative texts</h1>
{% if legislative_texts %} {% if legislative_texts %}
<ul> <ul>
{% for text in legislative_texts %} {% for text in legislative_texts %}
@ -13,5 +12,4 @@
{% else %} {% else %}
<p>No texts available</p> <p>No texts available</p>
{% endif %} {% endif %}
</div>
{% endblock content %} {% endblock content %}

2
franklincce/explorer/templates/explorer/base.html
View File

@ -11,7 +11,7 @@
</head> </head>
<body> <body>
<nav id="navbar" class="boxed"> <nav id="navbar">
<div id="leftnav"> <div id="leftnav">
<a href="/explorer">explorer</a> <a href="/explorer">explorer</a>
</div> </div>

19
franklincce/explorer/templates/explorer/conference.html
View File

@ -1,19 +0,0 @@
{% extends "explorer/base.html" %}
{% block content %}
{% if sample.is_bill %}
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
{% elif sample.is_resolution %}
<link rel="stylesheet" type="text/css" href="/static/un.css" />
{% endif %}
<div class="boxed">
<h1>{{ book.name }} Conference</h1>
<ul>
{% for text in legislation %}
<li><a href="/explorer/legislation/{{ text.id }}">{{ text.legislation_title }}</a></li>
{% endfor %}
</ul>
</div>
{% endblock content %}

3
franklincce/explorer/templates/explorer/index.html
View File

@ -1,8 +1,6 @@
{% extends "explorer/base.html" %} {% extends "explorer/base.html" %}
{% block content %} {% block content %}
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
<div class="boxed">
<h1>Welcome to explorer</h1> <h1>Welcome to explorer</h1>
<p><i>an interactive database for YMCA CCE legislation</i></p> <p><i>an interactive database for YMCA CCE legislation</i></p>
@ -18,5 +16,4 @@
{% else %} {% else %}
<p>No texts available</p> <p>No texts available</p>
{% endif %} {% endif %}
</div>
{% endblock content %} {% endblock content %}

12
franklincce/explorer/templates/explorer/legislation.html
View File

@ -1,21 +1,13 @@
{% extends "explorer/base.html" %} {% extends "explorer/base.html" %}
{% block content %} {% block content %}
{% if legislation.is_bill %}
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
{% elif legislation.is_resolution %}
<link rel="stylesheet" type="text/css" href="/static/un.css" />
{% endif %}
<div id="legcontainer"> <div id="legcontainer">
<div id="leginfo" class="boxed"> <div id="leginfo" class="boxed">
<h1 class="no-margin-top">{{ legislation.legislation_title }}</h1> <h1 class="no-margin-top wrapword">{{ legislation.legislation_title }}</h1>
<p><i>{{ legislation.assembly }}/{{ legislation.committee }}/{{ legislation.docket_order }}</i></p> <i>{{ legislation.assembly }}/{{ legislation.committee }}/{{ legislation.docket_order }}</i>
<p>Sponsored by {{ legislation.sponsors }} of {{ legislation.school }}</p> <p>Sponsored by {{ legislation.sponsors }} of {{ legislation.school }}</p>
<p>Presented as part of the <a href="/explorer/conference/{{ legislation.from_book.id }}">{{ legislation.from_book.name }}</a> conference</p>
</div> </div>
<div id="legislation" class="boxed"> <div id="legislation" class="boxed">

1
franklincce/explorer/urls.py
View File

@ -6,5 +6,4 @@ urlpatterns = [
path("", views.index, name="index"), path("", views.index, name="index"),
path("all/", views.all, name="all"), path("all/", views.all, name="all"),
path("legislation/<int:legislation_id>/", views.view_legislation, name="viewleg"), path("legislation/<int:legislation_id>/", views.view_legislation, name="viewleg"),
path("conference/<int:conference_id>/", views.view_conference, name="viewconf"),
] ]

10
franklincce/explorer/views.py
View File

@ -27,13 +27,3 @@ def view_legislation(request, legislation_id):
"lines": legislation.get_lines() "lines": legislation.get_lines()
} }
return render(request, "explorer/legislation.html", context) return render(request, "explorer/legislation.html", context)
def view_conference(request, conference_id):
book = get_object_or_404(LegislationBook, pk=conference_id)
results = LegislativeText.objects.filter(from_book=book)
context = {
"book": book,
"legislation": results,
"sample": results[0]
}
return render(request, "explorer/conference.html", context)

2
franklincce/franklincce/settings.py
View File

@ -24,7 +24,7 @@ SECRET_KEY = 'django-insecure-1%p#re)z*_xd9umo0!1foh(yiz&2=*5q#0b4(m42r0^m%kxli#
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ["localhost", "192.168.0.87", "127.0.0.1", "[::1]"] ALLOWED_HOSTS = ["localhost", "127.0.0.1", "[::1]"]
# Application definition # Application definition

52
franklincce/static/style.css
View File

@ -1,36 +1,12 @@
:root {
--component-bg-color: rgba(10, 10, 10, 0.7);
--text-color: rgb(150, 150, 150);
--accented-text-color: rgb(255, 255, 255);
}
body { body {
font-family: sans-serif; font-family: sans-serif;
} }
a {
color: lightblue;
}
a:active {
color: orangered;
}
a:visited {
color: mediumpurple;
}
::-moz-selection ::selection {
color: blue;
}
nav#navbar { nav#navbar {
border-bottom: 1px solid black; /* block for top bar */
padding-bottom: 10px;
display: flex; /* make it from left to right */ display: flex; /* make it from left to right */
flex-direction: row; flex-direction: row;
background-color: var(--component-bg-color);
background-clip: padding-box;
padding-left: 10px;
padding-right: 10px;
} }
#leftnav { #leftnav {
@ -48,7 +24,8 @@ nav#navbar {
#legcontainer { #legcontainer {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 10px;
gap: 5px;
} }
#leginfo { #leginfo {
@ -67,7 +44,6 @@ nav#navbar {
@media only screen and (max-width: 570px) { @media only screen and (max-width: 570px) {
#legcontainer { #legcontainer {
flex-direction: column; flex-direction: column;
padding-right: 10px;
} }
#leginfo { #leginfo {
width: 100%; width: 100%;
@ -83,19 +59,21 @@ nav#navbar {
padding: 5px; padding: 5px;
padding-top: 0px; padding-top: 0px;
border: solid 1px; border: solid 1px;
background-color: var(--component-bg-color);
border-radius: 5px; border-radius: 5px;
} }
.wrapword {
white-space: -moz-pre-wrap !important;
white-space: -pre-wrap;
white-space: -o-pre-wrap;
white-space: pre-wrap;
word-wrap: break-word;
white-space: -webkit-pre-wrap;
word-break: break-all;
white-space: normal;
}
.legnumbers { .legnumbers {
text-align: right; text-align: right;
user-select: none; user-select: none;
} }
h1, h2, h3, h4, h5, h6 {
color: var(--accented-text-color);
}
p, td, i, ul, li {
color: var(--text-color);
}

BIN
franklincce/static/tn-cap.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 149 KiB

7
franklincce/static/tn.css
View File

@ -1,7 +0,0 @@
body {
background-image: url("/static/tn-cap.jpg");
background-position: center;
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;
}

BIN
franklincce/static/un-gen-asm.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

7
franklincce/static/un.css
View File

@ -1,7 +0,0 @@
body {
background-image: url("/static/un-gen-asm.jpg");
background-position: center;
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;
}