mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-03-03 10:38:23 +00:00
Compare commits
9 Commits
ddce9752c6
...
revert-594
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ded31adbb4 | ||
|
|
6c8eb380fd | ||
|
3123d3899c
|
|||
|
|
c93c04ec6e | ||
| 6bf8d56ce8 | |||
|
8246071b8c
|
|||
|
06fa1a3b1b
|
|||
|
70abfaf2ae
|
|||
|
02a5a94fbb
|
8
.github/workflows/django.yml
vendored
8
.github/workflows/django.yml
vendored
@@ -14,9 +14,9 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
PYTHONDONTWRITEBYTECODE: 1
|
PYTHONDONTWRITEBYTECODE: 1
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
cache: 'pipenv'
|
cache: 'pipenv'
|
||||||
@@ -27,7 +27,7 @@ jobs:
|
|||||||
# if: steps.pcache.outputs.cache-hit != 'true'
|
# if: steps.pcache.outputs.cache-hit != 'true'
|
||||||
- name: Cache Static Files
|
- name: Cache Static Files
|
||||||
id: static-cache
|
id: static-cache
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: 'pipeline/built_assets'
|
path: 'pipeline/built_assets'
|
||||||
key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
|
key: ${{ hashFiles('package-lock.json') }}-${{ hashFiles('pipeline/source_assets') }}
|
||||||
@@ -43,7 +43,7 @@ jobs:
|
|||||||
pipenv run python3 manage.py collectstatic --noinput
|
pipenv run python3 manage.py collectstatic --noinput
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: pipenv run pytest -n auto --cov
|
run: pipenv run pytest -n auto --cov
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v4
|
||||||
if: failure()
|
if: failure()
|
||||||
with:
|
with:
|
||||||
name: failure-screenshots ${{ matrix.test-group }}
|
name: failure-screenshots ${{ matrix.test-group }}
|
||||||
|
|||||||
2
Pipfile
2
Pipfile
@@ -57,7 +57,7 @@ static3 = "~=0.7.0"
|
|||||||
svg2rlg = "~=0.3"
|
svg2rlg = "~=0.3"
|
||||||
tini = "~=3.0.1"
|
tini = "~=3.0.1"
|
||||||
tornado = "~=6.3"
|
tornado = "~=6.3"
|
||||||
urllib3 = "~=1.26.18"
|
urllib3 = "~=1.26.19"
|
||||||
whitenoise = "~=5.2.0"
|
whitenoise = "~=5.2.0"
|
||||||
yolk = "~=0.4.3"
|
yolk = "~=0.4.3"
|
||||||
zipp = "~=3.4.0"
|
zipp = "~=3.4.0"
|
||||||
|
|||||||
8
Pipfile.lock
generated
8
Pipfile.lock
generated
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_meta": {
|
"_meta": {
|
||||||
"hash": {
|
"hash": {
|
||||||
"sha256": "411e277c026f8628f74377ae59084d78697965f120561456d0bb77c358cf46d9"
|
"sha256": "641c8452654d194106ec4339baeab760361695bbe91edf7f0c7483551656ab8e"
|
||||||
},
|
},
|
||||||
"pipfile-spec": 6,
|
"pipfile-spec": 6,
|
||||||
"requires": {
|
"requires": {
|
||||||
@@ -1253,12 +1253,12 @@
|
|||||||
"socks"
|
"socks"
|
||||||
],
|
],
|
||||||
"hashes": [
|
"hashes": [
|
||||||
"sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07",
|
"sha256:37a0344459b199fce0e80b0d3569837ec6b6937435c5244e7fd73fa6006830f3",
|
||||||
"sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"
|
"sha256:3e3d753a8618b86d7de333b4223005f68720bcd6a7d2bcb9fbd2229ec7c1e429"
|
||||||
],
|
],
|
||||||
"index": "pypi",
|
"index": "pypi",
|
||||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
|
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
|
||||||
"version": "==1.26.18"
|
"version": "==1.26.19"
|
||||||
},
|
},
|
||||||
"webencodings": {
|
"webencodings": {
|
||||||
"hashes": [
|
"hashes": [
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<style>
|
<style>
|
||||||
#event_table {
|
#event_table {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: max-content auto;
|
grid-template-columns: max-content min-content minmax(max-content, 1fr) max-content;
|
||||||
column-gap: 1em;
|
column-gap: 1em;
|
||||||
}
|
}
|
||||||
.eventgrid {
|
.eventgrid {
|
||||||
@@ -11,14 +11,9 @@
|
|||||||
grid-column: 1/5;
|
grid-column: 1/5;
|
||||||
grid-template-columns: subgrid;
|
grid-template-columns: subgrid;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
dt {
|
dt, dd { display: block; float: left; }
|
||||||
float: left;
|
dt { clear: both; }
|
||||||
clear: left;
|
dd { float: right; }
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
dd {
|
|
||||||
margin-left: 0px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.grid-header {
|
.grid-header {
|
||||||
border-bottom: 1px solid grey;
|
border-bottom: 1px solid grey;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ const con = require('gulp-concat');
|
|||||||
const gulpif = require('gulp-if');
|
const gulpif = require('gulp-if');
|
||||||
|
|
||||||
function fonts(done) {
|
function fonts(done) {
|
||||||
return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
|
return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*', { encoding: false })
|
||||||
.pipe(gulp.dest('pipeline/built_assets/fonts'))
|
.pipe(gulp.dest('pipeline/built_assets/fonts'))
|
||||||
.pipe(browsersync.stream());
|
.pipe(browsersync.stream());
|
||||||
}
|
}
|
||||||
@@ -70,14 +70,14 @@ function scripts() {
|
|||||||
.pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
|
.pipe(gulpif(function(file) { return interaction.includes(file.relative);}, con('interaction.js')))
|
||||||
.pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
|
.pipe(gulpif(function(file) { return jpop.includes(file.relative);}, con('jpop.js')))
|
||||||
.pipe(flatten())
|
.pipe(flatten())
|
||||||
.pipe(terser())
|
// Only minify if filename does not already denote it as minified
|
||||||
|
.pipe(gulpif(function(file) { return file.path.indexOf("min") == -1;},terser()))
|
||||||
.pipe(gulp.dest(dest))
|
.pipe(gulp.dest(dest))
|
||||||
.pipe(browsersync.stream());
|
.pipe(browsersync.stream());
|
||||||
}
|
}
|
||||||
|
|
||||||
function browserSync(done) {
|
function browserSync(done) {
|
||||||
spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'});
|
spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'});
|
||||||
// TODO Wait for Django server to come up before browsersync, it seems inconsistent
|
|
||||||
browsersync.init({
|
browsersync.init({
|
||||||
notify: true,
|
notify: true,
|
||||||
open: false,
|
open: false,
|
||||||
|
|||||||
3269
package-lock.json
generated
3269
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,6 @@
|
|||||||
"cssnano": "^5.0.13",
|
"cssnano": "^5.0.13",
|
||||||
"easymde": "^2.16.1",
|
"easymde": "^2.16.1",
|
||||||
"fullcalendar": "^5.10.1",
|
"fullcalendar": "^5.10.1",
|
||||||
"gulp": "^5.0.0",
|
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"gulp-flatten": "^0.4.0",
|
"gulp-flatten": "^0.4.0",
|
||||||
"gulp-if": "^3.0.0",
|
"gulp-if": "^3.0.0",
|
||||||
@@ -34,7 +33,8 @@
|
|||||||
"uglify-js": "^3.14.5"
|
"uglify-js": "^3.14.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"browser-sync": "^3.0.2"
|
"browser-sync": "^3.0.2",
|
||||||
|
"gulp": "^5.0.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"gulp": "gulp",
|
"gulp": "gulp",
|
||||||
|
|||||||
@@ -1,16 +1,11 @@
|
|||||||
function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters
|
function changeSelectedValue(obj,pk,text,update_url) { //Pass in JQuery object and new parameters
|
||||||
//console.log('Changing selected value');
|
//console.log('Changing selected value');
|
||||||
obj.find('option').remove(); //Remove all the available options
|
obj.find('option').remove(); //Remove all the available options
|
||||||
obj.append( //Add the new option
|
obj[0].add(new Option(text, pk, true, true)); // Add new option
|
||||||
$("<option></option>")
|
//obj.selectpicker('val', pk); //Set the new value to be selected
|
||||||
.attr("value",pk)
|
obj.selectpicker('refresh');
|
||||||
.text(text)
|
|
||||||
.data('update_url',update_url)
|
|
||||||
);
|
|
||||||
obj.selectpicker('render'); //Re-render the UI
|
|
||||||
obj.selectpicker('refresh'); //Re-render the UI
|
|
||||||
obj.selectpicker('val', pk); //Set the new value to be selected
|
|
||||||
obj.change(); //Trigger the change function manually
|
obj.change(); //Trigger the change function manually
|
||||||
|
//console.log(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
function refreshUpdateHref(obj) {
|
function refreshUpdateHref(obj) {
|
||||||
|
|||||||
@@ -17,14 +17,12 @@ jQuery(document).ready(function () {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
var easter_egg = new Konami();
|
var easter_egg = new Konami(function () {
|
||||||
easter_egg.code = function () {
|
|
||||||
var s = document.createElement('script');
|
var s = document.createElement('script');
|
||||||
s.type = 'text/javascript';
|
s.type = 'text/javascript';
|
||||||
document.body.appendChild(s);
|
document.body.appendChild(s);
|
||||||
s.src = '{% static "js/asteroids.min.js"%}';
|
s.src = '/static/js/asteroids.min.js';
|
||||||
ga('send', 'event', 'easter_egg', 'activated');
|
});
|
||||||
}
|
|
||||||
easter_egg.load();
|
easter_egg.load();
|
||||||
});
|
});
|
||||||
//CTRL-Enter form submission
|
//CTRL-Enter form submission
|
||||||
|
|||||||
Reference in New Issue
Block a user