Skip to content

Commit

Permalink
script de la BD actualizado
Browse files Browse the repository at this point in the history
  • Loading branch information
NotMorales committed Jun 29, 2020
1 parent 0310546 commit 19ead43
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 6 deletions.
46 changes: 46 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:8b3iFP2Ltp/iI/LVccjch+pk8x7cF5bGJ5kkjHL7asc=
APP_DEBUG=true
APP_URL=http://localhost

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=localhost
DB_PORT=3306
DB_DATABASE=wingsarmy
DB_USERNAME=root
DB_PASSWORD=

BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379

MAIL_MAILER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_FROM_NAME="${APP_NAME}"

AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=

PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/public/storage
/storage/*.key
/vendor
.env
.env.backup
.phpunit.result.cache
Homestead.json
Expand Down
10 changes: 6 additions & 4 deletions DB.sql
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ CREATE TABLE IF NOT EXISTS `WingsArmy`.`mesero` (
`nombre` VARCHAR(100) NOT NULL,
`telefono` VARCHAR(15) NOT NULL,
`correo` VARCHAR(100) NOT NULL,
`direccion` VARCHAR(10) NOT NULL,
`avatar` VARCHAR(255) NOT NULL,
`direccion` VARCHAR(100) NOT NULL,
`avatar` VARCHAR(255) NULL,
`created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
`updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
`deleted_at` TINYINT NULL DEFAULT 0,
PRIMARY KEY (`meseroId`))
;

Expand All @@ -27,7 +28,7 @@ CREATE TABLE IF NOT EXISTS `WingsArmy`.`mesa` (
`mesaId` INT NOT NULL AUTO_INCREMENT,
`nombre` VARCHAR(100) NOT NULL,
`descripcion` VARCHAR(100) NULL,
`estado` INT NULL,
`estado` INT NULL DEFAULT 0,
`created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
`updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`mesaId`))
Expand Down Expand Up @@ -82,8 +83,9 @@ CREATE TABLE IF NOT EXISTS `WingsArmy`.`asignacion` (
`asignacionId` INT NOT NULL AUTO_INCREMENT,
`mesaId` INT NOT NULL,
`meseroId` INT NOT NULL,
`fecha` DATETIME NOT NULL,
`fecha` DATE NOT NULL,
`total` DOUBLE NULL,
`final` TIME NULL,
`created_at` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP,
`updated_at` TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`asignacionId`),
Expand Down
Binary file modified WingsArmy.mwb
Binary file not shown.
Binary file modified WingsArmy.mwb.bak
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<hr class="featurette-divider">

<footer class="container">
<p>&copy; 2020 Universidad Veracruzana. &middot; Desarrollo de software &middot; Equipo: Wing´s Army</p>
<p>&copy; 2020 Universidad Veracruzana. &middot; Desarrollo de aplicaciones &middot; Equipo: Wing´s Army</p>
</footer>
</main>

Expand Down

0 comments on commit 19ead43

Please sign in to comment.