From 9a003f1072247baeeb179b9af7e14cdd93ef2017 Mon Sep 17 00:00:00 2001 From: zbw Date: Fri, 19 Apr 2019 18:04:55 +0800 Subject: [PATCH 1/7] upload env example --- .idea/Phylab.iml | 3 --- .idea/deployment.xml | 3 ++- .idea/php.xml | 3 --- Phylab/.env.example | 18 ++++++++---------- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.idea/Phylab.iml b/.idea/Phylab.iml index 47be4a2d..afba8dc4 100644 --- a/.idea/Phylab.iml +++ b/.idea/Phylab.iml @@ -13,7 +13,6 @@ - @@ -31,7 +30,6 @@ - @@ -69,7 +67,6 @@ - diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 491dbeaa..ac1379e9 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -17,8 +17,9 @@ - + + diff --git a/.idea/php.xml b/.idea/php.xml index c564286c..b39d5fc6 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -12,7 +12,6 @@ - @@ -31,7 +30,6 @@ - @@ -40,7 +38,6 @@ - diff --git a/Phylab/.env.example b/Phylab/.env.example index 8eb8f575..d520f68a 100644 --- a/Phylab/.env.example +++ b/Phylab/.env.example @@ -1,19 +1,17 @@ -APP_ENV=local -APP_DEBUG=true -APP_KEY=SomeRandomString - -DB_HOST=localhost -DB_DATABASE=homestead -DB_USERNAME=homestead -DB_PASSWORD=secret - +APP_ENV=production +APP_DEBUG=false +APP_KEY=238GU1dVG7UciXXPWCmkxwgOKE8CoTS3 +DB_HOST=127.0.0.1 +DB_DATABASE=Phylab_db +DB_USERNAME= +DB_PASSWORD= CACHE_DRIVER=file SESSION_DRIVER=file QUEUE_DRIVER=sync - MAIL_DRIVER=smtp MAIL_HOST=mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +SERVER_PAGE="" From 0f7520afe17c24d8463f7b344de4eec3df3ddb91 Mon Sep 17 00:00:00 2001 From: zbw Date: Fri, 19 Apr 2019 18:06:57 +0800 Subject: [PATCH 2/7] upload database.php --- .gitignore | 1 - wecenter/system/config/database.php | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 wecenter/system/config/database.php diff --git a/.gitignore b/.gitignore index cf522314..b809cbfc 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ storage/*.key .env.php .env -wecenter/system/config/database.php .idea/ diff --git a/wecenter/system/config/database.php b/wecenter/system/config/database.php new file mode 100644 index 00000000..73811f49 --- /dev/null +++ b/wecenter/system/config/database.php @@ -0,0 +1,13 @@ + 'utf8', + 'host' => '127.0.0.1', + 'username' => '', + 'password' => '', + 'dbname' => 'Phylab_db', +); +$config['slave'] = false; From 75dfb5341a4284da788420ce429c9ab507704c7c Mon Sep 17 00:00:00 2001 From: zbw Date: Tue, 7 May 2019 10:57:51 +0800 Subject: [PATCH 3/7] mobile page refactor in progress --- .idea/deployment.xml | 2 +- Phylab/resources/views/auth/login.blade.php | 8 +-- .../resources/views/auth/register.blade.php | 8 +-- Phylab/resources/views/index.blade.php | 12 ++--- Phylab/resources/views/layout/main.blade.php | 5 +- Phylab/resources/views/report/index.blade.php | 52 +++++++++++-------- Phylab/resources/views/user/index.blade.php | 48 ++++++++--------- 7 files changed, 72 insertions(+), 63 deletions(-) diff --git a/.idea/deployment.xml b/.idea/deployment.xml index ac1379e9..968984c7 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,6 @@ - + diff --git a/Phylab/resources/views/auth/login.blade.php b/Phylab/resources/views/auth/login.blade.php index 9e2ef046..7c3a2250 100644 --- a/Phylab/resources/views/auth/login.blade.php +++ b/Phylab/resources/views/auth/login.blade.php @@ -149,26 +149,26 @@ -