Skip to content

Commit 67408cb

Browse files
authored
Merge pull request #30 from BinaryStudioAcademy/dev
Dev
2 parents e5b611c + fedda7a commit 67408cb

File tree

183 files changed

+15611
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+15611
-194
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_style = space
7+
indent_size = 4
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true

.gitignore

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
/node_modules
2-
/public/hot
3-
/public/storage
4-
/storage/*.key
5-
/vendor
6-
.env
7-
.phpunit.result.cache
8-
Homestead.json
9-
Homestead.yaml
10-
npm-debug.log
11-
yarn-error.log
1+
.idea
2+
.vscode
123

.styleci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
preset: psr2
2+
3+
risky: false
4+
5+
disabled:
6+
- elseif
7+
- single_blank_line_at_eof
8+
- single_import_per_statement
9+
- function_declaration
10+

.travis.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
dist: xenial
2+
3+
services:
4+
- mysql
5+
6+
language: php
7+
8+
php:
9+
- 7.2
10+
11+
cache:
12+
directories:
13+
- $HOME/.composer/cache
14+
15+
before_install:
16+
- cd $TRAVIS_BUILD_DIR/backend
17+
- composer validate
18+
- mysql -e 'CREATE DATABASE thread'
19+
20+
install:
21+
- composer install --no-interaction --prefer-source
22+
23+
before_script:
24+
- cp .env.travis .env
25+
- php artisan migrate --force
26+
27+
script:
28+
- vendor/bin/phpunit --coverage-clover=coverage.xml -c phpunit.travis.xml
29+
30+
after_success:
31+
- bash <(curl -s https://codecov.io/bash)
32+
33+

app/Exceptions/Handler.php

Lines changed: 0 additions & 51 deletions
This file was deleted.

app/User.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

backend/.env.example

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
APP_NAME=Laravel
2+
APP_ENV=local
3+
APP_KEY=
4+
APP_DEBUG=true
5+
APP_URL=http://localhost
6+
7+
LOG_CHANNEL=stack
8+
9+
DB_CONNECTION=mysql
10+
DB_HOST=127.0.0.1
11+
DB_PORT=3306
12+
DB_DATABASE=homestead
13+
DB_USERNAME=homestead
14+
DB_PASSWORD=secret
15+
16+
BROADCAST_DRIVER=log
17+
CACHE_DRIVER=file
18+
QUEUE_CONNECTION=sync
19+
SESSION_DRIVER=file
20+
SESSION_LIFETIME=120
21+
22+
REDIS_HOST=127.0.0.1
23+
REDIS_PASSWORD=null
24+
REDIS_PORT=6379
25+
26+
MAIL_DRIVER=smtp
27+
MAIL_HOST=smtp.mailtrap.io
28+
MAIL_PORT=2525
29+
MAIL_USERNAME=null
30+
MAIL_PASSWORD=null
31+
MAIL_ENCRYPTION=null
32+
33+
AWS_ACCESS_KEY_ID=
34+
AWS_SECRET_ACCESS_KEY=
35+
AWS_DEFAULT_REGION=us-east-1
36+
AWS_BUCKET=
37+
38+
PUSHER_APP_ID=
39+
PUSHER_APP_KEY=
40+
PUSHER_APP_SECRET=
41+
PUSHER_APP_CLUSTER=mt1
42+
43+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
44+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
45+
46+
JWT_SECRET=
47+
48+
MYSQL_PORT=33061
49+
APP_PORT=7777
50+
MYSQL_PORT_TEST_DB=33062

backend/.env.testing

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
APP_KEY=base64:70WifS7kyzGyovfVSvZdMIpkQu6lWda873VoTQc0BEg=
2+
3+
DB_CONNECTION=mysql
4+
DB_HOST=mysql-testing
5+
DB_PORT=3306
6+
DB_DATABASE=thread-testing
7+
DB_USERNAME=user
8+
DB_PASSWORD=secret
9+
10+
JWT_SECRET=somesecret

backend/.env.travis

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
APP_ENV=testing
2+
APP_KEY=base64:70WifS7kyzGyovfVSvZdMIpkQu6lWda873VoTQc0BEg=
3+
4+
DB_CONNECTION=mysql
5+
DB_HOST=127.0.0.1
6+
DB_PORT=3306
7+
DB_DATABASE=thread
8+
DB_USERNAME=root
9+
DB_PASSWORD=
10+
11+
JWT_SECRET=somesecret

backend/.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/node_modules
2+
/public/hot
3+
/public/storage
4+
/storage/*.key
5+
/vendor
6+
.env
7+
.phpunit.result.cache
8+
Homestead.json
9+
Homestead.yaml
10+
npm-debug.log
11+
yarn-error.log
12+
.idea
13+
.vscode
14+
.mysqldata

0 commit comments

Comments
 (0)