Skip to content

Feature/implmenet mobile phone into registration form #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 126 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
7a95a73
Part 10 and 11, install voyager & dynamic menus
drehimself Feb 2, 2018
bdf57a5
change migration class name
drehimself Feb 2, 2018
14271fb
change migration drop table name
drehimself Feb 5, 2018
b88de38
checkout: redirect if no items in cart
drehimself Feb 6, 2018
39ef3f5
Part 12 - Image Uploads
drehimself Feb 8, 2018
329e751
Part 13 - Image Gallery
drehimself Feb 8, 2018
3865e82
Part 14 - require users to create an account
drehimself Feb 12, 2018
6aeef27
Part 15 - Allow Guest Checkout
drehimself Feb 13, 2018
bf4e32d
Part 16 - Customizing Views & Controllers in Voyager
drehimself Feb 16, 2018
f1d3254
Part 17 - Artisan Command for installing
drehimself Feb 20, 2018
431c61a
force seeds in production
drehimself Feb 20, 2018
04d0698
login instructions on login page
drehimself Feb 20, 2018
70e59a1
fix missing default images in public/storage folder
drehimself Feb 20, 2018
0512bfd
Add a readme with installation instructions
drehimself Feb 20, 2018
e88a85a
update readme
drehimself Feb 21, 2018
6f4a4f0
Part 18 - Orders Table in Database
drehimself Feb 25, 2018
0158ab9
update installation script for orders
drehimself Feb 25, 2018
c76230d
npm update
drehimself Feb 25, 2018
913df71
Part 19 - Transactional Emails
drehimself Feb 26, 2018
b375839
Fixes #1. Added a check in the controller. Based on a solution in the…
drehimself Mar 3, 2018
99e232e
typo in mailable
drehimself Mar 4, 2018
8b60eaf
add html/css for search component
drehimself Mar 5, 2018
2e723b4
Part 20 - Search Products
drehimself Mar 6, 2018
9e3eb8d
Part 21 - Search with Algolia
drehimself Mar 9, 2018
85a606b
fix search JS on cart and product page
drehimself Mar 9, 2018
add8374
fix algolia img thumbnail path
drehimself Mar 9, 2018
61f6f16
update install script
drehimself Mar 9, 2018
2b63214
Fixes #2. Need an extra backslash for regex
drehimself Mar 12, 2018
ca911ab
Part 22 - Search with algolia (InstantSearch)
drehimself Mar 13, 2018
beb66ed
fix image path
drehimself Mar 13, 2018
7cb2f48
update readme
drehimself Mar 14, 2018
fb9d8c5
save cart contents on logout if config set
drehimself Mar 19, 2018
1dbe0d4
Part 24 - Styling Auth Pages
drehimself Mar 22, 2018
a5827f9
redirect to main page after resetting password
drehimself Mar 22, 2018
2729d52
Fixes #5. Catch exception if Algolia credentials incorrect
drehimself Apr 7, 2018
57baf73
update readme
drehimself Apr 7, 2018
c0172a5
update readme
drehimself Apr 7, 2018
8e3ecca
update readme
drehimself Apr 9, 2018
9028fb3
update readme
drehimself Apr 11, 2018
fc6e91e
Fixes #7. Redirect to appropriate checkout page if guest
drehimself Apr 17, 2018
6e33f6d
Fixes #7. Guest redirect if invalid coupon
drehimself Apr 17, 2018
8da35b3
Fixes #7. Just use back method to avoid unnecessary guest checks
drehimself Apr 17, 2018
c598a0c
Fixes #7. Just use back method to avoid unnecessary guest checks. For…
drehimself Apr 17, 2018
389b71b
Part 25 - Fix #8. Don't allow negative totals in checkout
drehimself Apr 18, 2018
5fb2bec
Part 25 - Fix #9. Recalculate totals after cart is updated.
drehimself Apr 18, 2018
0ef3696
Part 25 - Fix #10. Move coupon submit to cart page
drehimself Apr 18, 2018
855e029
Part 26 - Upgrade to Voyager 1.1
drehimself Apr 23, 2018
4fe417f
Part 26 - Upgrade to Laravel 5.6
drehimself Apr 23, 2018
f638d71
update ecommerce:install script for Voyager 1.1
drehimself Apr 23, 2018
6240d4d
fix wrapping issue in algolia search box dropdown
drehimself Apr 23, 2018
ba58580
fix issue with not being able to edit bread
drehimself Jun 26, 2018
63aa57e
Part 27 - Product Quantity
drehimself Jun 29, 2018
b6b06c8
Part 28 - WordPress API
drehimself Jul 3, 2018
bc57b58
force seed in ecommerce install
drehimself Jul 3, 2018
b2678c5
Part 29 - Testing with PHPUnit
drehimself Jul 11, 2018
fcd7c68
Part 30 - Testing with Laravel Dusk
drehimself Jul 11, 2018
41505ee
Fix bug: price can be tampered with before adding product to cart
drehimself Jul 11, 2018
626f94f
Update composer to not use dusk
drehimself Jul 11, 2018
efce397
Fix #17. Incorrect discount when two items in cart and save for later…
drehimself Jul 25, 2018
2ae2022
Update checkout.blade.php
AbhinavDobhal Jul 28, 2018
d1437a9
Update cart.blade.php
AbhinavDobhal Aug 1, 2018
83b3837
Merge pull request #18 from AbhinavDobhal/patch-1
drehimself Aug 1, 2018
af07e18
Merge pull request #19 from AbhinavDobhal/patch-2
drehimself Aug 1, 2018
f3c9b16
Part 31 - User Dashboard
drehimself Oct 14, 2018
3634a9c
Typo
drehimself Oct 15, 2018
76e72ca
Remove .env.dusk.local
drehimself Oct 20, 2018
4f98cfc
Part 32 - Paypal Checkout
drehimself Oct 29, 2018
f11c5b7
Update install script error messages
drehimself Nov 2, 2018
1ec8632
Upgrade to Laravel 5.7
drehimself Nov 22, 2018
9a934b7
Try catch if no braintree credentials are set
drehimself Dec 5, 2018
d292756
Try catch general exception for braintree. Hide from view
drehimself Dec 6, 2018
9e2dc91
Get the Stripe key from the services configuration
aabdyli Dec 9, 2018
c56fcea
Merge pull request #36 from aabdyli/patch-1
drehimself Dec 12, 2018
8a2a3b0
Upgrade to Laravel 5.8
drehimself Mar 18, 2019
04e9d26
Update readme
drehimself Mar 18, 2019
83bf3b3
Update vulnerabilities
drehimself Jun 7, 2019
cb3dd9c
Bump lodash.mergewith from 4.6.1 to 4.6.2
dependabot[bot] Jul 11, 2019
04f2b29
Merge pull request #50 from drehimself/dependabot/npm_and_yarn/lodash…
drehimself Jul 11, 2019
139f207
Bump lodash from 4.17.11 to 4.17.13
dependabot[bot] Jul 11, 2019
d9b2345
Bump clean-css from 4.1.8 to 4.2.1
dependabot[bot] Jul 11, 2019
0833347
Bump bootstrap-sass from 3.3.7 to 3.4.1
dependabot[bot] Jul 11, 2019
0ae3658
Bump no-case from 2.3.1 to 2.3.2
dependabot[bot] Jul 11, 2019
3a6e47a
Merge pull request #51 from drehimself/dependabot/npm_and_yarn/lodash…
drehimself Jul 11, 2019
196e6c3
Merge pull request #52 from drehimself/dependabot/npm_and_yarn/clean-…
drehimself Jul 11, 2019
8b731d6
Merge pull request #53 from drehimself/dependabot/npm_and_yarn/bootst…
drehimself Jul 11, 2019
be7d798
Merge pull request #54 from drehimself/dependabot/npm_and_yarn/no-cas…
drehimself Jul 11, 2019
b1ac51d
Upgrade to Laravel 6
drehimself Oct 28, 2019
01a1661
Merge branch 'master' of github.com:drehimself/laravel-ecommerce-example
drehimself Oct 28, 2019
aa66aca
Bump mixin-deep from 1.3.1 to 1.3.2
dependabot[bot] Oct 28, 2019
7235580
Merge pull request #66 from drehimself/dependabot/npm_and_yarn/mixin-…
drehimself Oct 29, 2019
5dc5469
Upgrade to ignition
drehimself Oct 30, 2019
983ed29
Merge branch 'master' of github.com:drehimself/laravel-ecommerce-example
drehimself Nov 4, 2019
9584eb7
fixed some bugs
saber13812002 Mar 19, 2020
6dbd083
Update readme.md
saber13812002 Mar 19, 2020
e73a276
لاراول فارسی شده راست به چپ فروشگاه اینترنتی اوپن سورس ترجمه شده ی وب…
saber13812002 Mar 20, 2020
ea5a375
فونت فارسی هم اضافه شد فونت وزیر و فونت ایران سنز و فونت وب یکان و فو…
saber13812002 Mar 20, 2020
1369c05
147-translate-all-pages
saber13812002 Mar 30, 2020
5ac3e74
Update readme.md
saber13812002 Oct 19, 2020
cf13fc8
parswebserver
saber13812002 May 4, 2021
f080a8b
Merge pull request #1 from saber13812002/feature/parswebserver
saber13812002 May 4, 2021
0394164
Merge branch 'master' of https://github.com/saber13812002/laravel-eco…
saber13812002 May 4, 2021
d03ce26
storage folder
saber13812002 May 5, 2021
d7209bd
3-blog posts route not worked
saber13812002 May 5, 2021
2889b99
Merge pull request #4 from saber13812002/3-blog-posts-route-not-worked
saber13812002 May 5, 2021
2429cc0
update app.js
saber13812002 May 5, 2021
c3da3c9
run npm
saber13812002 May 6, 2021
493562b
npm run prod
saber13812002 May 6, 2021
b99e3d5
document the npm server publishing
saber13812002 May 6, 2021
17123f4
search results page translates
saber13812002 May 6, 2021
f6e0bfd
translate forget password page
saber13812002 May 6, 2021
0da4f90
translate second page in resetpassword page
saber13812002 May 7, 2021
80b4186
dynamic menu remove static menu from top menu then test it
saber13812002 May 7, 2021
63a3a06
fix menu last item margin bug in css
saber13812002 May 7, 2021
55adebb
implement iransans font
saber13812002 May 8, 2021
b82fa0d
copy and replace all assets by laravel bat file
saber13812002 May 8, 2021
6202d90
Update readme.md
saber13812002 Jul 10, 2021
64330c6
update readme
a3dmorteza Jul 10, 2021
ff5e33c
...
a3dmorteza Jul 10, 2021
8c5812e
Dockerized!
a3dmorteza Jul 11, 2021
678524a
update readme
a3dmorteza Jul 11, 2021
683ee89
translate some words
a3dmorteza Jul 11, 2021
0f7148e
Merge pull request #7 from a3dmorteza/feature/Feature-Translate-My-Or…
saber13812002 Jul 11, 2021
eb76cad
Merge pull request #8 from a3dmorteza/feature/Dockerize
saber13812002 Jul 11, 2021
e4d0c8a
some code clean up
saber13812002 Jul 16, 2021
3b840dc
resolve merge conflicts
saber13812002 Jul 16, 2021
ad5e072
feat: add mobile into registration form
saber13812002 Jul 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .ci/fpm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[www]
; increase limits
php_admin_value[upload_max_filesize] = 20M
php_admin_value[post_max_size] = 20M
php_admin_value[memory_limit] = 256M

; enable logs
php_admin_flag[log_errors] = on
php_flag[display_errors] = off
28 changes: 28 additions & 0 deletions .ci/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
server {
listen 80;
server_name localhost;
root /var/www/html/public;

index index.php;
charset utf-8;

location / {
try_files $uri $uri/ /index.php$is_args$args;
}

location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }

location ~ \.php(?:$|/) {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_pass shop:9000;
fastcgi_index index.php;
fastcgi_intercept_errors on;
include fastcgi_params;
}

location ~ /\.(?!well-known).* {
deny all;
}
}
7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.*
Dockerfile
docker-compose.yml
LICENSE
#vendor
*.md
laravel.bat
23 changes: 18 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost
APP_URL=http://localhost:8000

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_HOST=shop-db
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
DB_DATABASE=shop_db
DB_USERNAME=user
DB_PASSWORD=user-secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
Expand All @@ -28,6 +28,19 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

FILESYSTEM_DRIVER=parswebserver
STORAGE_PATH="/home/pardisa2/public_html"


PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=

ALGOLIA_APP_ID=4VFHI2HQOQ
ALGOLIA_SECRET=ea5e8d3b4b0312ee0faeefa659088a95

BT_MERCHANT_ID
BT_PUBLIC_KEY
BT_PRIVATE_KEY

ADMIN_PASSWORD=31321321321311231
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ Homestead.yaml
npm-debug.log
yarn-error.log
.env
.env.dusk.local
.gitignore
22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Listen for XDebug",
"type": "php",
"request": "launch",
"port": 9000
},
{
"name": "Launch currently open script",
"type": "php",
"request": "launch",
"program": "${file}",
"cwd": "${fileDirname}",
"port": 9000
}
]
}
49 changes: 49 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#

# PHP Dependencies

#

FROM composer as build1
COPY . .

RUN composer install \
--ignore-platform-reqs \
--no-interaction \
--no-plugins \
--no-scripts \
--prefer-dist

#####################################################################

#

# Frontend

#

FROM node as build2

RUN mkdir -p /app
WORKDIR /app

COPY --from=build1 /app .

RUN npm install && npm run dev

#####################################################################

FROM php:7.4-fpm

RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

RUN apt-get update && apt-get install -y netcat \
&& apt-get install -y libzip-dev zip \
&& docker-php-ext-install zip mysqli pdo pdo_mysql

COPY --from=build2 --chown=www-data /app .
RUN mv docker-entrypoint.sh /

EXPOSE 9000
USER "www-data:www-data"
ENTRYPOINT ["/bin/sh", "/docker-entrypoint.sh"]
10 changes: 10 additions & 0 deletions app/Admin/Controllers/AuthController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App\Admin\Controllers;

use Encore\Admin\Controllers\AuthController as BaseAuthController;

class AuthController extends BaseAuthController
{

}
67 changes: 67 additions & 0 deletions app/Admin/Controllers/ExampleController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php

namespace App\Admin\Controllers;

use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
use Encore\Admin\Show;

class ExampleController extends AdminController
{
/**
* Title for current resource.
*
* @var string
*/
protected $title = 'Example controller';

/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
$grid = new Grid(new ExampleModel);

$grid->column('id', __('ID'))->sortable();
$grid->column('created_at', __('Created at'));
$grid->column('updated_at', __('Updated at'));

return $grid;
}

/**
* Make a show builder.
*
* @param mixed $id
* @return Show
*/
protected function detail($id)
{
$show = new Show(ExampleModel::findOrFail($id));

$show->field('id', __('ID'));
$show->field('created_at', __('Created at'));
$show->field('updated_at', __('Updated at'));

return $show;
}

/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
$form = new Form(new ExampleModel);

$form->display('id', __('ID'));
$form->display('created_at', __('Created At'));
$form->display('updated_at', __('Updated At'));

return $form;
}
}
34 changes: 34 additions & 0 deletions app/Admin/Controllers/HomeController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

namespace App\Admin\Controllers;

use App\Http\Controllers\Controller;
use Encore\Admin\Controllers\Dashboard;
use Encore\Admin\Layout\Column;
use Encore\Admin\Layout\Content;
use Encore\Admin\Layout\Row;

class HomeController extends Controller
{
public function index(Content $content)
{
return $content
->title('Dashboard')
->description('Description...')
->row(Dashboard::title())
->row(function (Row $row) {

$row->column(4, function (Column $column) {
$column->append(Dashboard::environment());
});

$row->column(4, function (Column $column) {
$column->append(Dashboard::extensions());
});

$row->column(4, function (Column $column) {
$column->append(Dashboard::dependencies());
});
});
}
}
101 changes: 101 additions & 0 deletions app/Admin/Controllers/PostController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?php

namespace App\Admin\Controllers;

use App\Post;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
use Encore\Admin\Show;

class PostController extends AdminController
{
/**
* Title for current resource.
*
* @var string
*/
protected $title = 'App\Post';

/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
$grid = new Grid(new Post());

$grid->column('id', __('Id'));
$grid->column('author_id', __('Author id'));
$grid->column('category_id', __('Category id'));
$grid->column('title', __('Title'));
$grid->column('seo_title', __('Seo title'));
$grid->column('excerpt', __('Excerpt'));
$grid->column('body', __('Body'));
$grid->column('image', __('Image'));
$grid->column('slug', __('Slug'));
$grid->column('meta_description', __('Meta description'));
$grid->column('meta_keywords', __('Meta keywords'));
$grid->column('status', __('Status'));
$grid->column('featured', __('Featured'));
$grid->column('created_at', __('Created at'));
$grid->column('updated_at', __('Updated at'));

return $grid;
}

/**
* Make a show builder.
*
* @param mixed $id
* @return Show
*/
protected function detail($id)
{
$show = new Show(Post::findOrFail($id));

$show->field('id', __('Id'));
$show->field('author_id', __('Author id'));
$show->field('category_id', __('Category id'));
$show->field('title', __('Title'));
$show->field('seo_title', __('Seo title'));
$show->field('excerpt', __('Excerpt'));
$show->field('body', __('Body'));
$show->field('image', __('Image'));
$show->field('slug', __('Slug'));
$show->field('meta_description', __('Meta description'));
$show->field('meta_keywords', __('Meta keywords'));
$show->field('status', __('Status'));
$show->field('featured', __('Featured'));
$show->field('created_at', __('Created at'));
$show->field('updated_at', __('Updated at'));

return $show;
}

/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
$form = new Form(new Post());

$form->number('author_id', __('Author id'));
$form->number('category_id', __('Category id'));
$form->text('title', __('Title'));
$form->text('seo_title', __('Seo title'));
$form->textarea('excerpt', __('Excerpt'));
$form->textarea('body', __('Body'));
$form->image('image', __('Image'));
$form->text('slug', __('Slug'));
$form->textarea('meta_description', __('Meta description'));
$form->textarea('meta_keywords', __('Meta keywords'));
$form->text('status', __('Status'))->default('DRAFT');
$form->switch('featured', __('Featured'));

return $form;
}
}
Loading