Skip to content

Commit

Permalink
Merge pull request #18 from gerMdz/17-wizard-section
Browse files Browse the repository at this point in the history
17 wizard section
  • Loading branch information
gerMdz authored May 13, 2021
2 parents 381cf5e + 6650c7d commit 895f0cb
Show file tree
Hide file tree
Showing 131 changed files with 73,577 additions and 92 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ yarn-error.log

/public/vendors/tilt/
/public/css/stream-ui-kit/assets/vendors/
/public/fonts/awasome/
/public/fonts/druk/
/public/fonts/univers/
/public/css/stream-ui-kit/assets/img/
Expand Down Expand Up @@ -109,3 +108,6 @@ yarn-error.log
/public/images/institucional/qr-dom-10hs.jpg
/public/images/institucional/qr-dom-21hs.jpg
/public/images/institucional/qr-sab-21hs.jpg
/public/images/base.jpg
/public/images/logo-mail.png
/public/images/logo.png
68 changes: 68 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#!/bin/bash

DOCKER_BE = grace-be
OS := $(shell uname)

ifeq ($(OS),Darwin)
UID = $(shell id -u)
else ifeq ($(OS),Linux)
UID = $(shell id -u)
else
UID = 1000
endif

help: ## Show this help message
@echo 'usage: make [target]'
@echo
@echo 'targets:'
@egrep '^(.+)\:\ ##\ (.+)' ${MAKEFILE_LIST} | column -t -c 2 -s ':#'

run: ## Start the containers
docker network create vero-network || true
U_ID=${UID} docker-compose up -d

stop: ## Stop the containers
U_ID=${UID} docker-compose stop

restart: ## Restart the containers
$(MAKE) stop && $(MAKE) run

build: ## Rebuilds all the containers
U_ID=${UID} docker-compose build

prepare: ## Runs backend commands
$(MAKE) composer-install

# Backend commands
composer-install: ## Installs composer dependencies
U_ID=${UID} docker exec --user ${UID} -it ${DOCKER_BE} composer install --no-scripts --no-interaction --optimize-autoloader

migrations: ## Runs the migrations
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} bin/console doctrine:migrations:migrate -n

be-logs: ## Tails the Symfony dev log
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} tail -f var/log/dev.log
# End backend commands

ssh-be: ## ssh's into the be container
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} bash

code-style: ## Runs php-cs to fix code styling following Symfony rules
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} php-cs-fixer fix src --rules=@Symfony

generate-ssh-keys: ## Generar los ssh keys de JWT library
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} mkdir -p config/jwt
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} openssl genrsa -passout pass:21023c10e2208b4d3a4a279ea0bf5ee6 -out config/jwt/private.pem -aes256 4096
U_ID=${UID} docker exec -it --user ${UID} ${DOCKER_BE} openssl rsa -pubout -passin pass:21023c10e2208b4d3a4a279ea0bf5ee6 -in config/jwt/private.pem -out config/jwt/public.pem

clear-cache: ## ejecuta cache:clear
U_ID=${UID} docker exec --user ${UID} -it ${DOCKER_BE} php bin/console cache:clear

assets-install: ## ejecuta assets:install en docker
U_ID=${UID} docker exec --user ${UID} -it ${DOCKER_BE} php bin/console assets:install --symlink public

yarn-encore: ## ejecuta yarn encore
U_ID=${UID} docker exec --user ${UID} -it ${DOCKER_BE} yarn encore dev

yarn-install: ## install yarn dependencies
U_ID=${UID} docker exec --user ${UID} -it ${DOCKER_BE} yarn install
13 changes: 13 additions & 0 deletions assets/js/select2.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import $ from 'jquery';
import 'select2'; // globally assign select2 fn to $ element
import 'select2/dist/css/select2.css'; // optional if you have css loader

$(function () {
$('.select2-enable').select2({
placeholder: 'Seleccione la página en donde se insertará la sección',
allowClear: true
});

console.log('select2')
});

6 changes: 6 additions & 0 deletions config/packages/liip_imagine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ liip_imagine:
size: [200, 200]
mode: outbound
allow_upscale: true
squared_thumbnail_section:
filters:
thumbnail:
size: [ 300, 100 ]
mode: outbound
allow_upscale: true
squared_thumbnail_100:
filters:
thumbnail:
Expand Down
41 changes: 41 additions & 0 deletions docker-compose.yml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
version: '3.5'

services:
grace-web:
container_name: grace-web
build:
context: ./docker/nginx
args:
UID: $U_ID
ports:
- 250:80
volumes:
- ./public:/appdata/www/public
depends_on:
- grace-be
networks:
- grace-network

grace-be:
container_name: grace-be
build:
context: docker/php
args:
UID: $U_ID
environment:
PHP_IDE_CONFIG: serverName=Docker
PHP_XDEBUG_ENABLED: 1
XDEBUG_CONFIG: remote_host=172.17.0.1 remote_port=9005 # Linux users
# XDEBUG_CONFIG: remote_host=host.docker.internal remote_port=9005 # MacOS users
volumes:
- ./:/appdata/www
- ./docker/php/xdebug-linux.ini:/usr/local/etc/php/conf.d/xdebug.ini
# - ./docker/php/xdebug-macos.ini:/usr/local/etc/php/conf.d/xdebug.ini
- ~/.ssh/id_rsa:/home/appuser/.ssh/id_rsa

networks:
- grace-network

networks:
grace-network:
external: true
21 changes: 21 additions & 0 deletions public/bt5-softui-dash/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit 895f0cb

Please sign in to comment.