Skip to content

Commit

Permalink
Merge branch 'develop' into feature/EGCETSII#13-Votings-API
Browse files Browse the repository at this point in the history
  • Loading branch information
@JSnow11
JSnow11 authored Jan 3, 2022
2 parents 7f89b13 + 43136b6 commit d8f0068
Show file tree
Hide file tree
Showing 35 changed files with 23,059 additions and 141 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
cp ./decide/local_settings.example.py ./decide/local_settings.py
- name: Test administration module
run: |
python ./decide/manage.py test administration
python ./decide/manage.py test administration
16 changes: 16 additions & 0 deletions .github/workflows/herokuDevelop.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Heroku Develop CI

on:
push:
branches: [develop]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: akhileshns/[email protected] # This is the action
with:
heroku_api_key: ${{secrets.HEROKU_API_KEY_ADMINISTRATION}}
heroku_app_name: "decide-full-tortuga-admin-dev"
heroku_email: ${{secrets.HEROKU_APP_EMAIL_ADMINISTRATION}}
16 changes: 16 additions & 0 deletions .github/workflows/herokuMain.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Heroku Main CI

on:
push:
branches: [master, main]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: akhileshns/[email protected] # This is the action
with:
heroku_api_key: ${{secrets.HEROKU_API_KEY_ADMINISTRATION}}
heroku_app_name: "decide-full-tortuga-admin"
heroku_email: ${{secrets.HEROKU_APP_EMAIL_ADMINISTRATION}}
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ __pycache__/

# ide
.vscode
.idea

# Distribution / packaging
.Python
Expand Down
4 changes: 4 additions & 0 deletions Procfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
% prepara el repositorio para su despliegue.
release: sh -c 'cd decide && python manage.py migrate'
% especifica el comando para lanzar Decide
web: sh -c 'cd decide && gunicorn decide.wsgi --log-file -'
22 changes: 22 additions & 0 deletions decide/administration/frontend/build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"files": {
"main.css": "/static/css/main.ba08e160.chunk.css",
"main.js": "/static/js/main.5f006c93.chunk.js",
"main.js.map": "/static/js/main.5f006c93.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.a385cff1.js",
"runtime-main.js.map": "/static/js/runtime-main.a385cff1.js.map",
"static/js/2.f675216a.chunk.js": "/static/js/2.f675216a.chunk.js",
"static/js/2.f675216a.chunk.js.map": "/static/js/2.f675216a.chunk.js.map",
"static/js/3.5503b4d2.chunk.js": "/static/js/3.5503b4d2.chunk.js",
"static/js/3.5503b4d2.chunk.js.map": "/static/js/3.5503b4d2.chunk.js.map",
"index.html": "/index.html",
"static/css/main.ba08e160.chunk.css.map": "/static/css/main.ba08e160.chunk.css.map",
"static/js/2.f675216a.chunk.js.LICENSE.txt": "/static/js/2.f675216a.chunk.js.LICENSE.txt"
},
"entrypoints": [
"static/js/runtime-main.a385cff1.js",
"static/js/2.f675216a.chunk.js",
"static/css/main.ba08e160.chunk.css",
"static/js/main.5f006c93.chunk.js"
]
}
Binary file added decide/administration/frontend/build/favicon.ico
View file
Binary file not shown.
1 change: 1 addition & 0 deletions decide/administration/frontend/build/index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><link href="/static/css/main.ba08e160.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,i,a=r[0],c=r[1],l=r[2],s=0,p=[];s<a.length;s++)i=a[s],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&p.push(o[i][0]),o[i]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);p.length;)p.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var c=t[a];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,a=document.createElement("script");a.charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.src=function(e){return i.p+"static/js/"+({}[e]||e)+"."+{3:"5503b4d2"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){a.onerror=a.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:a})}),12e4);a.onerror=a.onload=u,document.head.appendChild(a)}return Promise.all(r)},i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/",i.oe=function(e){throw console.error(e),e};var a=this.webpackJsonpfrontend=this.webpackJsonpfrontend||[],c=a.push.bind(a);a.push=r,a=a.slice();for(var l=0;l<a.length;l++)r(a[l]);var f=c;t()}([])</script><script src="/static/js/2.f675216a.chunk.js"></script><script src="/static/js/main.5f006c93.chunk.js"></script></body></html>
Binary file added decide/administration/frontend/build/logo192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added decide/administration/frontend/build/logo512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions decide/administration/frontend/build/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions decide/administration/frontend/build/robots.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
6 changes: 6 additions & 0 deletions decide/administration/frontend/build/static/css/main.ba08e160.chunk.css
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions decide/administration/frontend/build/static/css/main.ba08e160.chunk.css.map
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions decide/administration/frontend/build/static/js/2.f675216a.chunk.js
View file

Large diffs are not rendered by default.

102 changes: 102 additions & 0 deletions decide/administration/frontend/build/static/js/2.f675216a.chunk.js.LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/

/*! *****************************************************************************
Copyright (c) Microsoft Corporation.

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */

/**
* React Router DOM v6.0.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router v6.0.2
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/** @license MUI v5.0.2
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v0.20.2
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license React v17.0.2
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
1 change: 1 addition & 0 deletions decide/administration/frontend/build/static/js/2.f675216a.chunk.js.map
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions decide/administration/frontend/build/static/js/3.5503b4d2.chunk.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d8f0068

Please sign in to comment.