add

b_beauty/database/migrations/2019_12_15_075556_create_user.php → b_beauty/database/migrations/2019_12_15_142918_create_users_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateUser extends Migration
+class CreateUsersTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,14 +13,14 @@ class CreateUser extends Migration
      */
     public function up()
     {
-        Schema::create('item', function (Blueprint $table) {
-            $table->integer('u_id',11);
-            $table->Varchar('u_username',50);
-            $table->Varchar('u_password',12);
-            $table->varchar('u_displayname',50);
-            $table->Varchar('u_email',50);
-            $table->text('u_pic');
+        Schema::create('users', function (Blueprint $table) {
+            $table->integer('u_id');
+            $table->string('u_username',50);
+            $table->string('u_password',12);
+            $table->string('u_displayname',50);
+            $table->string('u_email',50);
             $table->Integer('tu_id');
+            $table->text('u_pic');
             
         });
     }
@@ -32,6 +32,6 @@ class CreateUser extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('item');
+        Schema::dropIfExists('users');
     }
 }

b_beauty/database/migrations/2019_12_15_084735_create_typeuser.php → b_beauty/database/migrations/2019_12_15_143242_create_typeusers_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTypeuser extends Migration
+class CreateTypeusersTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,9 +13,9 @@ class CreateTypeuser extends Migration
      */
     public function up()
     {
-        Schema::create('item', function (Blueprint $table) {
-            $table->integer('tu_id');
-            $table->Varchar('tu_name',50);
+        Schema::create('typeusers', function (Blueprint $table) {
+            $table->integer('tu_id',11);
+            $table->string('tu_name',50);
         });
     }
 
@@ -26,6 +26,6 @@ class CreateTypeuser extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('item');
+        Schema::dropIfExists('typeusers');
     }
 }

b_beauty/database/migrations/2019_12_15_092052_create_table_promotion.php → b_beauty/database/migrations/2019_12_15_144000_create_shop_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTablePromotion extends Migration
+class CreateShopTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,15 +13,18 @@ class CreateTablePromotion extends Migration
      */
     public function up()
     {
-        Schema::create('table_promotion', function (Blueprint $table) {
-            $table->integer('p_id',11);
-            $table->Varchar('s_name',50);
-            $table->Integer('ts_id',11);
-            $table->time('s_open',6);
-            $table->text('s_address',50);
+        Schema::create('shop', function (Blueprint $table) {
+            $table->integer('s_id',11);
+            $table->string('s_name',50);
+            $table->integer('ts_id',11);
+            $table->text('s_address');
             $table->text('s_tel');
+            $table->text('s_detial');
+            $table->time('s_open',6);
             $table->time('s_close',6);
             $table->text('s_map');
+      
+        
         });
     }
 
@@ -32,6 +35,6 @@ class CreateTablePromotion extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('table_promotion');
+        Schema::dropIfExists('shop');
     }
 }

b_beauty/database/migrations/2019_12_15_084839_create_typeshop.php → b_beauty/database/migrations/2019_12_15_144034_create_typeshop_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTypeshop extends Migration
+class CreateTypeshopTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,9 +13,9 @@ class CreateTypeshop extends Migration
      */
     public function up()
     {
-        Schema::create('item', function (Blueprint $table) {
+        Schema::create('typeshop', function (Blueprint $table) {
             $table->integer('ts_id');
-            $table->Varchar('ts_name',50);
+            $table->string('ts_name',50);
         });
     }
 
@@ -26,6 +26,6 @@ class CreateTypeshop extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('item');
+        Schema::dropIfExists('typeshop');
     }
 }

b_beauty/database/migrations/2019_12_15_091843_create_table__shop_img.php → b_beauty/database/migrations/2019_12_15_144243_create_shop_img_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTableShopImg extends Migration
+class CreateShopImgTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateTableShopImg extends Migration
      */
     public function up()
     {
-        Schema::create('table__shop_img', function (Blueprint $table) {
+        Schema::create('shop_img', function (Blueprint $table) {
             $table->integer('si_id',11);
             $table->text('si_img');
             $table->integer('s_id',11);
@@ -27,6 +27,6 @@ class CreateTableShopImg extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('table__shop_img');
+        Schema::dropIfExists('shop_img');
     }
 }

b_beauty/database/migrations/2019_12_15_085610_create_shop.php → b_beauty/database/migrations/2019_12_15_144331_create_promotion_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateShop extends Migration
+class CreatePromotionTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,12 +13,12 @@ class CreateShop extends Migration
      */
     public function up()
     {
-        Schema::create('item', function (Blueprint $table) {
-            $table->integer('s_id',11);
-            $table->date('p_day',8);
-            $table->Integer('s_id',11);
+        Schema::create('promotion', function (Blueprint $table) {
+            $table->integer('p_id',11);
+            $table->String('p_name',50);
+            $table->date('p_date',11);
             $table->text('p_detail');
-            
+            $table->integer('s_id',11);
         });
     }
 
@@ -29,6 +29,6 @@ class CreateShop extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('item');
+        Schema::dropIfExists('promotion');
     }
 }

b_beauty/database/migrations/2019_12_15_092650_create_table_booking.php → b_beauty/database/migrations/2019_12_15_144447_create_booking_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTableBooking extends Migration
+class CreateBookingTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateTableBooking extends Migration
      */
     public function up()
     {
-        Schema::create('table_booking', function (Blueprint $table) {
+        Schema::create('booking', function (Blueprint $table) {
             $table->integer('b_id',11);
             $table->integer('l_id',11);
             $table->date('b_date',8);
@@ -30,6 +30,6 @@ class CreateTableBooking extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('table_booking');
+        Schema::dropIfExists('booking');
     }
 }

b_beauty/database/migrations/2019_12_15_093013_create_table_list.php → b_beauty/database/migrations/2019_12_15_144523_create_list_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTableList extends Migration
+class CreateListTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,12 +13,11 @@ class CreateTableList extends Migration
      */
     public function up()
     {
-        Schema::create('table_list', function (Blueprint $table) {
+        Schema::create('list', function (Blueprint $table) {
             $table->integer('l_id',11);
-            $table->Varchar('l_name',50);
-            $table->Varchar('l_price',10);
+            $table->string('l_name',50);
+            $table->string('l_price',10);
             $table->Integer('s_id',11);
-            
         });
     }
 
@@ -29,6 +28,6 @@ class CreateTableList extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('table_list');
+        Schema::dropIfExists('list');
     }
 }

b_beauty/database/migrations/2019_12_15_092334_create_table_reviews.php → b_beauty/database/migrations/2019_12_15_144629_create_reviews_table.php

@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateTableReviews extends Migration
+class CreateReviewsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,16 +13,14 @@ class CreateTableReviews extends Migration
      */
     public function up()
     {
-        Schema::create('table_reviews', function (Blueprint $table) {
+        Schema::create('reviews', function (Blueprint $table) {
             $table->integer('r_id',11);
             $table->text('r_topic');
             $table->text('r_message');
             $table->integer('r_pont',5);
-            $table->Varchar('u_email',50);
             $table->Integer('s_id',11);
             $table->text('r_pic');
             $table->Integer('u_id',11);
-            
         });
     }
 
@@ -33,6 +31,6 @@ class CreateTableReviews extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('table_reviews');
+        Schema::dropIfExists('reviews');
     }
 }

b_beauty/public/addshop.php

+<!doctype html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+    <title>จองคิวร้านเสริมสวย กับ B Beauty </title>
+  </head>
+  <body>
+  
+  </body>
+</html>
\ No newline at end of file

b_beauty/public/index.php

@@ -12,7 +12,7 @@
   </head>
   <body>
   <nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <a class="navbar-brand" href="#">Navbar</a>
+    <a class="navbar-brand" href="index.php">B Beauty</a>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
@@ -21,9 +21,8 @@
       <ul class="navbar-nav mr-auto">
          
       </ul>
-    
-    <button class="btn btn-outline-success my-2 my-sm-0" type="submit">ลงทะเบียน</button>&nbsp;&nbsp;&nbsp;&nbsp;
-      <button class="btn btn-outline-success my-2 my-sm-0" type="submit">เข้าสู่ระบบ</button>
+        <a href="rigister.php"><button class="btn btn-outline-success my-2 my-sm-0" >ลงทะเบียน</button></a>&nbsp;&nbsp;&nbsp;&nbsp;
+        <a href="login.php"><button class="btn btn-outline-success my-2 my-sm-0" >เข้าสู่ระบบ</button></a>
     
     </div>
 </nav>

b_beauty/public/login.php

@@ -41,7 +41,7 @@
 /* ---------- GENERAL ---------- */
 
 body {
-	background: #f4f4f4;
+	background: #5f9ea0;
 	color: #5a5656;
 	font: 100%/1.5em 'Open Sans', sans-serif;
   margin: 0;
@@ -67,6 +67,7 @@ h1, p {
     width: 100%;
     border: #5791da 1px solid;
     font-size: 1.1em;
+    text-align: center;
 }
 
 strong {
@@ -167,7 +168,7 @@ body {
     font-weight: 400;
     margin: 0;
     text-align: center;    
-    font-size: 1.8em;
+    font-size: 2em;
 }
 
 .error-message {
@@ -252,10 +253,11 @@ body {
 </style>
 </head>
 <body>
+
 <div id="login">
    <form name="frmRegistration" method="post" action="">
         <div class="demo-table">
-        <div class="form-head">Login</div>
+        <div class="form-head">เข้าสู่ระบบ</div>
             
     <?php
       if (! empty($errorMessage) && is_array($errorMessage)) {
@@ -271,19 +273,19 @@ body {
       }
     ?>
             <div class="field-column">
-                <label>Username</label>
+                <label>ชื่อผู้ใช้งาน</label>
                 <div>
 				<input type="text" class="demo-input-box" required value="Username" onBlur="if(this.value=='')this.value='Username'" onFocus="if(this.value=='Username')this.value='' "><!-- JS because of IE support; better: placeholder="Username" -->
                 </div>
             </div>
             
             <div class="field-column">
-                <label>Password</label>
+                <label>รหัสผ่าน</label>
                 <div><input type="password" class="demo-input-box" required value="Password" onBlur="if(this.value=='')this.value='Password'" onFocus="if(this.value=='Password')this.value='' "><!-- JS because of IE support; better: placeholder="Password" --></div>
             </div>
             
             <div class="field-column">
-                <label>  <a href="#">Forgot Password?</a></label>
+                <label>  <a href="#">ลืมรหัสผ่าน?</a></label>
                
 
             </div>
@@ -292,7 +294,7 @@ body {
                 
                 <div>
                     <input type="submit"
-                        name="login-user" value="Login"
+                        name="login-user" value="เข้าสู่ระบบ"
                         class="btnlogin">
                 </div>
             <span class="btn-round">or</span>
@@ -302,7 +304,7 @@ body {
 				 
 				<a class="facebook-before "><span class="fontawesome-facebook"></span></a>
 				<p >
-                     Login Using Facbook</button>
+                เข้าสู่ระบบด้วย Facebook</button>
 					 </p>
                      
 
@@ -322,7 +324,7 @@ body {
 	 
 
 
-</body>
+
 <!--start footer-->
 
 <!--end footer--> 

b_beauty/public/rigister.php

@@ -22,6 +22,7 @@ body {
     font-family: Arial;
     color: #333;
     font-size: 0.95em;
+    background: #696969;
 }
 
 .form-head {
@@ -31,6 +32,7 @@ body {
     margin: 0;
     text-align: center;    
     font-size: 1.8em;
+    
 }
 
 .error-message {
@@ -113,10 +115,10 @@ body {
 <body>
 <form name="frmRegistration" method="post" action="">
         <div class="demo-table">
-        <div class="form-head">Sign Up</div>
+        <div class="form-head">ลงทะเบียน</div>
             
-<?php
-if (! empty($errorMessage) && is_array($errorMessage)) {
+    <?php
+        if (! empty($errorMessage) && is_array($errorMessage)) {
     ?>	
             <div class="error-message">
             <?php 
@@ -125,11 +127,11 @@ if (! empty($errorMessage) && is_array($errorMessage)) {
             }
             ?>
             </div>
-<?php
-}
-?>
+    <?php
+        }
+    ?>
             <div class="field-column">
-                <label>Username</label>
+                <label>ชื่อผู้ใช้งาน</label>
                 <div>
                     <input type="text" class="demo-input-box"
                         name="userName"
@@ -138,19 +140,19 @@ if (! empty($errorMessage) && is_array($errorMessage)) {
             </div>
             
             <div class="field-column">
-                <label>Password</label>
+                <label>รหัสผ่าน</label>
                 <div><input type="password" class="demo-input-box"
                     name="password" value=""></div>
             </div>
             <div class="field-column">
-                <label>Confirm Password</label>
+                <label>ยืนยันรหัสผ่าน</label>
                 <div>
                     <input type="password" class="demo-input-box"
                         name="confirm_password" value="">
                 </div>
             </div>
             <div class="field-column">
-                <label>Display Name</label>
+                <label>ชื่อผู้ใช้งาน</label>
                 <div>
                     <input type="text" class="demo-input-box"
                         name="firstName"
@@ -166,6 +168,23 @@ if (! empty($errorMessage) && is_array($errorMessage)) {
                         value="<?php if(isset($_POST['userEmail'])) echo $_POST['userEmail']; ?>">
                 </div>
             </div>
+            
+            <div class="input-group mb-3">
+            
+                <div class="form-group">
+                    <label for="exampleFormControlFile1">อัปโหลดรูปภาพ</label>
+                    <input type="file" class="form-control-file" id="exampleFormControlFile1">
+                </div>
+
+            </div>
+            <div class="form-group">
+               <label for="exampleFormControlSelect1">ประเภทผู้ใช้งาน</label>
+                  <select class="form-control" id="exampleFormControlSelect1">
+                        <option>1</option>
+                        <option>2</option>
+                        <option>3</option>
+                    </select>
+            </div>
             <div class="field-column">
                 <div class="terms">
                     <input type="checkbox" name="terms"> I accept terms
@@ -173,7 +192,7 @@ if (! empty($errorMessage) && is_array($errorMessage)) {
                 </div>
                 <div>
                     <input type="submit"
-                        name="register-user" value="Register"
+                        name="register-user" value="ลงทะเบียน"
                         class="btnRegister">
                 </div>
             </div>