Merge pull request #50 from devinmatte/versioning

Adding proper versioning
ComputerScienceHouse · Sep 4, 2018 · d027404 · d027404
2 parents 2150eff + 684a646
commit d027404
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "CSH Packet",
   "name": "csh-packet",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "A webpacket for CSH",
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/packet/issues",

diff --git a/packet/__init__.py b/packet/__init__.py
@@ -10,6 +10,8 @@
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_sqlalchemy import SQLAlchemy
 
+from ._version import __version__
+
 app = Flask(__name__)
 
 # Load default configuration and any environment variable overrides
@@ -19,6 +21,8 @@
 if os.path.exists(os.path.join(os.getcwd(), "config.py")):
     app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
 
+app.config["VERSION"] = __version__
+
 # Initialize the extensions
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)

diff --git a/packet/_version.py b/packet/_version.py
@@ -0,0 +1 @@
+__version__ = "3.0.1"
diff --git a/packet/templates/include/footer.html b/packet/templates/include/footer.html
@@ -1,6 +1,6 @@
 <footer class="py-5 bg">
     <div class="container">
-        <p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet 3.0.0</a>
+        <p class="m-0 text-center text-white"><a href="https://github.com/ComputerScienceHouse/packet"> CSH Packet {{ config["VERSION"] }}</a>
         </p>
     </div>
 </footer>
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
@@ -62,12 +62,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.eboard %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -107,12 +101,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.upperclassmen %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -152,12 +140,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.freshmen %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
@@ -193,13 +175,6 @@ <h5>Upperclassmen Score</h5>
                             <table class="table table-striped no-bottom-margin" data-module="table"
                                    data-searchable="true" data-sort-column="3" data-sort-order="asc"
                                    data-length-changable="true" data-paginated="false">
-                                <thead>
-                                <tr>
-                                    <th></th>
-                                    <th>Name</th>
-                                    <th>Signature</th>
-                                </tr>
-                                </thead>
                                 <tbody>
                                 {% for m in signatures.misc %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>