Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first pull #76

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b73c2d1
Add or update the App Service deployment workflow configuration from …
fxbloi Jun 30, 2021
1cddfb7
Update app.py
fxbloi Jun 30, 2021
a81e39b
Add or update the App Service deployment workflow configuration from …
fxbloi Jul 1, 2021
ec5a667
Update app.py
fxbloi Jul 1, 2021
05fda89
Update app.py
fxbloi Jul 1, 2021
fa1a6c8
Update app.py
fxbloi Jul 1, 2021
de84eee
Add files via upload
fxbloi Jul 1, 2021
4cb9798
Update app.py
fxbloi Jul 1, 2021
4d123f3
Update app.py
fxbloi Jul 1, 2021
bd0ea19
Add files via upload
fxbloi Jul 1, 2021
b4087dd
Se agrega una ruta para el login y se renderiza el login.html en la c…
eimt Jul 5, 2021
2a83bdb
Se agrega bootstrap al archivo de requerimientos
eimt Jul 5, 2021
8ef5057
La funcion para login habia quedado con el nombre de 'hello', se camb…
eimt Jul 5, 2021
32f5e1c
Se corrige funcion de login y se agrega render de index
eimt Jul 5, 2021
7b52488
Se agrega html de index
eimt Jul 5, 2021
29bd0a5
Se agregan estilos
eimt Jul 5, 2021
b0c5e39
.
eimt Jul 6, 2021
1e7a06b
.
eimt Jul 6, 2021
92cdea3
.
eimt Jul 6, 2021
0746602
Se modifica saludo
eimt Jul 6, 2021
5970f77
.
eimt Jul 8, 2021
bb8bf32
.
eimt Jul 10, 2021
f213bd4
ci: add Azure Static Web Apps workflow file
fxbloi Sep 20, 2021
42d22a6
Add or update the App Service deployment workflow configuration from …
fxbloi Sep 21, 2021
f78a3ae
Update app.py
fxbloi Sep 21, 2021
5bbcadc
Add files via upload
fxbloi Sep 21, 2021
42e34db
Update app.py
fxbloi Sep 22, 2021
06a39de
Rename login.html to login2.html
fxbloi Sep 22, 2021
3938246
Add files via upload
fxbloi Sep 22, 2021
dfa433f
Add files via upload
fxbloi Sep 22, 2021
668ffe1
Add files via upload
fxbloi Sep 22, 2021
864b77f
Update app.py
fxbloi Sep 22, 2021
7c79318
Rename index.html to index3.html
fxbloi Sep 22, 2021
7cc5e71
Create index.html
fxbloi Sep 22, 2021
c6f5c90
Add files via upload
itorresdd Sep 27, 2021
8d890c4
Update index.html
itorresdd Sep 27, 2021
80ef8f5
Se elimina lo que no se va a usar
eimt Sep 30, 2021
41633ce
Borrar archivos y adecuar rutas css
eimt Sep 30, 2021
88977e4
adecuacion de mapeos a archivos
eimt Sep 30, 2021
5f7c12c
agregamos archivo requirements.txt
eimt Sep 30, 2021
6aa4006
Se apunta index a 'deepdatas.com'
eimt Oct 1, 2021
ed5925a
Se elimiinan archivos sin utilizar
eimt Oct 1, 2021
47f7207
Cambios en template
eimt Oct 1, 2021
70b79be
Se comenta boton de video
eimt Oct 1, 2021
2f2fb13
agregamos favicon
eimt Oct 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- master

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v2
with:
submodules: true
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_WATER_0159CF70F }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/" # App source code path
api_location: "" # Api source code path - optional
output_location: "" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_WATER_0159CF70F }}
action: "close"
62 changes: 62 additions & 0 deletions .github/workflows/master_DeepDatasPortalWeb.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
# More GitHub Actions for Azure: https://github.com/Azure/actions
# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions

name: Build and deploy Python app to Azure Web App - DeepDatasPortalWeb

on:
push:
branches:
- master
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Python version
uses: actions/setup-python@v1
with:
python-version: '3.9'

- name: Create and start virtual environment
run: |
python -m venv venv
source venv/bin/activate

- name: Install dependencies
run: pip install -r requirements.txt

# Optional: Add step to run tests here (PyTest, Django test suites, etc.)

- name: Upload artifact for deployment jobs
uses: actions/upload-artifact@v2
with:
name: python-app
path: |
.
!venv/

deploy:
runs-on: ubuntu-latest
needs: build
environment:
name: 'production'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v2
with:
name: python-app
path: .

- name: 'Deploy to Azure Web App'
uses: azure/webapps-deploy@v2
with:
app-name: 'DeepDatasPortalWeb'
slot-name: 'production'
publish-profile: ${{ secrets.AzureAppService_PublishProfile_c319a7003ec64800ba9fcc7f01ba00b8 }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ lib64/
parts/
sdist/
var/
venv/
*.egg-info/
.installed.cfg
*.egg
Expand Down
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

19 changes: 0 additions & 19 deletions README.md

This file was deleted.

18 changes: 12 additions & 6 deletions app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
from flask import Flask
app = Flask(__name__)

@app.route("/")
def hello():
return "Hello, World!"
from flask import Flask, render_template
from flask_bootstrap import Bootstrap

app = Flask(__name__)
bootstrap = Bootstrap(app)

@app.route("/")
def index():
return render_template('index.html')



2 changes: 2 additions & 0 deletions forms/Readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fully working PHP/AJAX contact form script is available in the pro version of the template.
You can buy it from: https://bootstrapmade.com/arsha-free-bootstrap-html-template-corporate/
41 changes: 41 additions & 0 deletions forms/contact.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/**
* Requires the "PHP Email Form" library
* The "PHP Email Form" library is available only in the pro version of the template
* The library should be uploaded to: vendor/php-email-form/php-email-form.php
* For more info and help: https://bootstrapmade.com/php-email-form/
*/

// Replace [email protected] with your real receiving email address
$receiving_email_address = '[email protected]';

if( file_exists($php_email_form = '../assets/vendor/php-email-form/php-email-form.php' )) {
include( $php_email_form );
} else {
die( 'Unable to load the "PHP Email Form" Library!');
}

$contact = new PHP_Email_Form;
$contact->ajax = true;

$contact->to = $receiving_email_address;
$contact->from_name = $_POST['name'];
$contact->from_email = $_POST['email'];
$contact->subject = $_POST['subject'];

// Uncomment below code if you want to use SMTP to send emails. You need to enter your correct SMTP credentials
/*
$contact->smtp = array(
'host' => 'example.com',
'username' => 'example',
'password' => 'pass',
'port' => '587'
);
*/

$contact->add_message( $_POST['name'], 'From');
$contact->add_message( $_POST['email'], 'Email');
$contact->add_message( $_POST['message'], 'Message', 10);

echo $contact->send();
?>
11 changes: 10 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
Flask>=1.0,<=1.1.2
click==8.0.1
colorama==0.4.4
dominate==2.6.0
Flask==2.0.1
Flask-Bootstrap==3.3.7.1
itsdangerous==2.0.1
Jinja2==3.0.1
MarkupSafe==2.0.1
visitor==0.1.3
Werkzeug==2.0.1
Binary file added static/.DS_Store
Binary file not shown.
Loading