diff --git a/README.md b/README.md index 9812291..cd55b5f 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,5 @@ + если на маке докер база не запускается то надо выключить галочку gRPS FUSE в настройках докера -tip: drop2Let \ No newline at end of file +tip: drop2Let +insurance interface project diff --git a/app/.git_bac/COMMIT_EDITMSG b/app/.git_bac/COMMIT_EDITMSG deleted file mode 100644 index d55e750..0000000 --- a/app/.git_bac/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Add initial set of files diff --git a/app/.git_bac/HEAD b/app/.git_bac/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/app/.git_bac/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/app/.git_bac/config b/app/.git_bac/config deleted file mode 100644 index 515f483..0000000 --- a/app/.git_bac/config +++ /dev/null @@ -1,5 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true diff --git a/app/.git_bac/description b/app/.git_bac/description deleted file mode 100644 index 498b267..0000000 --- a/app/.git_bac/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/app/.git_bac/hooks/applypatch-msg.sample b/app/.git_bac/hooks/applypatch-msg.sample deleted file mode 100755 index a5d7b84..0000000 --- a/app/.git_bac/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/app/.git_bac/hooks/commit-msg.sample b/app/.git_bac/hooks/commit-msg.sample deleted file mode 100755 index b58d118..0000000 --- a/app/.git_bac/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/app/.git_bac/hooks/fsmonitor-watchman.sample b/app/.git_bac/hooks/fsmonitor-watchman.sample deleted file mode 100755 index e673bb3..0000000 --- a/app/.git_bac/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff --git a/app/.git_bac/hooks/post-update.sample b/app/.git_bac/hooks/post-update.sample deleted file mode 100755 index ec17ec1..0000000 --- a/app/.git_bac/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/app/.git_bac/hooks/pre-applypatch.sample b/app/.git_bac/hooks/pre-applypatch.sample deleted file mode 100755 index 4142082..0000000 --- a/app/.git_bac/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/app/.git_bac/hooks/pre-commit.sample b/app/.git_bac/hooks/pre-commit.sample deleted file mode 100755 index 6a75641..0000000 --- a/app/.git_bac/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/app/.git_bac/hooks/pre-push.sample b/app/.git_bac/hooks/pre-push.sample deleted file mode 100755 index 6187dbf..0000000 --- a/app/.git_bac/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/app/.git_bac/hooks/pre-rebase.sample b/app/.git_bac/hooks/pre-rebase.sample deleted file mode 100755 index 6cbef5c..0000000 --- a/app/.git_bac/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/app/.git_bac/hooks/pre-receive.sample b/app/.git_bac/hooks/pre-receive.sample deleted file mode 100755 index a1fd29e..0000000 --- a/app/.git_bac/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/app/.git_bac/hooks/prepare-commit-msg.sample b/app/.git_bac/hooks/prepare-commit-msg.sample deleted file mode 100755 index 10fa14c..0000000 --- a/app/.git_bac/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/app/.git_bac/hooks/update.sample b/app/.git_bac/hooks/update.sample deleted file mode 100755 index 80ba941..0000000 --- a/app/.git_bac/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/app/.git_bac/index b/app/.git_bac/index deleted file mode 100644 index 881972f..0000000 Binary files a/app/.git_bac/index and /dev/null differ diff --git a/app/.git_bac/info/exclude b/app/.git_bac/info/exclude deleted file mode 100644 index a5196d1..0000000 --- a/app/.git_bac/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/app/.git_bac/logs/HEAD b/app/.git_bac/logs/HEAD deleted file mode 100644 index b67db57..0000000 --- a/app/.git_bac/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 e4ac978bf87e9f4c955753b40e8ac23e5e5ef033 Marat Salakhov 1627659921 +0000 commit (initial): Add initial set of files diff --git a/app/.git_bac/logs/refs/heads/master b/app/.git_bac/logs/refs/heads/master deleted file mode 100644 index b67db57..0000000 --- a/app/.git_bac/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 e4ac978bf87e9f4c955753b40e8ac23e5e5ef033 Marat Salakhov 1627659921 +0000 commit (initial): Add initial set of files diff --git a/app/.git_bac/objects/00/16b48e9de2e60276f12f790352aa3a1ee7d5f5 b/app/.git_bac/objects/00/16b48e9de2e60276f12f790352aa3a1ee7d5f5 deleted file mode 100644 index aa94c14..0000000 Binary files a/app/.git_bac/objects/00/16b48e9de2e60276f12f790352aa3a1ee7d5f5 and /dev/null differ diff --git a/app/.git_bac/objects/03/0c4de112d35411db52c6263d91e6c9e5dc117e b/app/.git_bac/objects/03/0c4de112d35411db52c6263d91e6c9e5dc117e deleted file mode 100644 index 56f652c..0000000 --- a/app/.git_bac/objects/03/0c4de112d35411db52c6263d91e6c9e5dc117e +++ /dev/null @@ -1,2 +0,0 @@ -xRM@ 弿R.+ rC$ؕq%Nf|Tc!P;IӴ{Z|=mm‡!(gS]U4.AWAWsWk8ySQr2ZqгZnjg ]=F,PJerϷYaR.ĩ?`-ͅ8*ki-l^^1c5n[i8|wDGD)]1SMe5t<-ϓJI)UK17W} -PA1BkNF5p ]0<˫exWlIZ-(Fúߧ elMIeA#t!Uqi, BS"ō'oG ɽb٘p@шqfs攼.R&kT /㧯O^<]!y͍d'I6i\!BډZ:p5 \ No newline at end of file diff --git a/app/.git_bac/objects/0d/8728e2fa9fab610afd99de4904981fe2cc3e29 b/app/.git_bac/objects/0d/8728e2fa9fab610afd99de4904981fe2cc3e29 deleted file mode 100644 index 40d733a..0000000 Binary files a/app/.git_bac/objects/0d/8728e2fa9fab610afd99de4904981fe2cc3e29 and /dev/null differ diff --git a/app/.git_bac/objects/0f/c74bbac4b757dd49782f0be496f6fd7e07e47c b/app/.git_bac/objects/0f/c74bbac4b757dd49782f0be496f6fd7e07e47c deleted file mode 100644 index c981b13..0000000 Binary files a/app/.git_bac/objects/0f/c74bbac4b757dd49782f0be496f6fd7e07e47c and /dev/null differ diff --git a/app/.git_bac/objects/12/9a86ed5edc17bd9cda51fdd25d86af39d3e712 b/app/.git_bac/objects/12/9a86ed5edc17bd9cda51fdd25d86af39d3e712 deleted file mode 100644 index 6e921ed..0000000 Binary files a/app/.git_bac/objects/12/9a86ed5edc17bd9cda51fdd25d86af39d3e712 and /dev/null differ diff --git a/app/.git_bac/objects/16/d7273bb47dff9f666cac8b2020104019a9d30f b/app/.git_bac/objects/16/d7273bb47dff9f666cac8b2020104019a9d30f deleted file mode 100644 index 2d65bf5..0000000 Binary files a/app/.git_bac/objects/16/d7273bb47dff9f666cac8b2020104019a9d30f and /dev/null differ diff --git a/app/.git_bac/objects/18/21ccc079e911f276bd1866f6349ce54c963ebe b/app/.git_bac/objects/18/21ccc079e911f276bd1866f6349ce54c963ebe deleted file mode 100644 index 58c5d5d..0000000 Binary files a/app/.git_bac/objects/18/21ccc079e911f276bd1866f6349ce54c963ebe and /dev/null differ diff --git a/app/.git_bac/objects/1e/5ab7880bf02b6c8982877393c846b9b3ca400d b/app/.git_bac/objects/1e/5ab7880bf02b6c8982877393c846b9b3ca400d deleted file mode 100644 index bf1a9bf..0000000 Binary files a/app/.git_bac/objects/1e/5ab7880bf02b6c8982877393c846b9b3ca400d and /dev/null differ diff --git a/app/.git_bac/objects/26/5bd3ee4410442d32ce3bf3de7e3726bbe102d6 b/app/.git_bac/objects/26/5bd3ee4410442d32ce3bf3de7e3726bbe102d6 deleted file mode 100644 index 427c8c0..0000000 Binary files a/app/.git_bac/objects/26/5bd3ee4410442d32ce3bf3de7e3726bbe102d6 and /dev/null differ diff --git a/app/.git_bac/objects/26/d4e53d2cd88a8d49c80fefe1b818da8e033f2e b/app/.git_bac/objects/26/d4e53d2cd88a8d49c80fefe1b818da8e033f2e deleted file mode 100644 index 749af16..0000000 --- a/app/.git_bac/objects/26/d4e53d2cd88a8d49c80fefe1b818da8e033f2e +++ /dev/null @@ -1,2 +0,0 @@ -x-AK@=WD>zp7K8 -J\6;P1.E[i 3(Èm!S۽gR|.fRԔ}ǂS=m9 L̵=֛@c3iMbտ?l{]ٻ8q֪'p=˵Y?-,w@c glr \ No newline at end of file diff --git a/app/.git_bac/objects/4c/6e4da6178e41330a48892db736bf55387568e8 b/app/.git_bac/objects/4c/6e4da6178e41330a48892db736bf55387568e8 deleted file mode 100644 index 00f5df9..0000000 Binary files a/app/.git_bac/objects/4c/6e4da6178e41330a48892db736bf55387568e8 and /dev/null differ diff --git a/app/.git_bac/objects/56/a650d89b2aec830ca3618bbdc7b6ff752e3501 b/app/.git_bac/objects/56/a650d89b2aec830ca3618bbdc7b6ff752e3501 deleted file mode 100644 index 2a968d6..0000000 Binary files a/app/.git_bac/objects/56/a650d89b2aec830ca3618bbdc7b6ff752e3501 and /dev/null differ diff --git a/app/.git_bac/objects/5e/bcdb2153c870e7d915f3b3fcdd55821424284c b/app/.git_bac/objects/5e/bcdb2153c870e7d915f3b3fcdd55821424284c deleted file mode 100644 index 3a528c8..0000000 Binary files a/app/.git_bac/objects/5e/bcdb2153c870e7d915f3b3fcdd55821424284c and /dev/null differ diff --git a/app/.git_bac/objects/60/026a1bd76945f662f2953fa6e81630e6b0cf03 b/app/.git_bac/objects/60/026a1bd76945f662f2953fa6e81630e6b0cf03 deleted file mode 100644 index 4464b2f..0000000 --- a/app/.git_bac/objects/60/026a1bd76945f662f2953fa6e81630e6b0cf03 +++ /dev/null @@ -1,2 +0,0 @@ -x} -0D=+*Vr<64 ɂMh9yof\CG\ɻE!(x #y&2V&b9hr0 ĩ|^M|^U,Ŵů*-@#eZ >U \ No newline at end of file diff --git a/app/.git_bac/objects/60/db5e123eccf3ff3e1bdcbaf57b51b2a3a80a8d b/app/.git_bac/objects/60/db5e123eccf3ff3e1bdcbaf57b51b2a3a80a8d deleted file mode 100644 index fcf8e53..0000000 Binary files a/app/.git_bac/objects/60/db5e123eccf3ff3e1bdcbaf57b51b2a3a80a8d and /dev/null differ diff --git a/app/.git_bac/objects/68/99b72003fca67f5a56b945cd3e07f5c8a33774 b/app/.git_bac/objects/68/99b72003fca67f5a56b945cd3e07f5c8a33774 deleted file mode 100644 index f331d73..0000000 Binary files a/app/.git_bac/objects/68/99b72003fca67f5a56b945cd3e07f5c8a33774 and /dev/null differ diff --git a/app/.git_bac/objects/78/53e9ed52b8997cf8ea4c7252c6476a7eb41794 b/app/.git_bac/objects/78/53e9ed52b8997cf8ea4c7252c6476a7eb41794 deleted file mode 100644 index 383b6c3..0000000 --- a/app/.git_bac/objects/78/53e9ed52b8997cf8ea4c7252c6476a7eb41794 +++ /dev/null @@ -1 +0,0 @@ -xRj0_1@ SC[ICKNF+b%wlBrFy2" "cn&QkK6vb$ C=Xl,%&PCul+'e0?>v_Oۿ?|c3nd "@}GGd=LX{a.`V4Rà FC?_`E1,؃w0b8VKW7S N h0ȝ[HS˭XN5&ֹ$m! si^Wzr}ܗY8n8OhިNYL;./,"=t@ \ No newline at end of file diff --git a/app/.git_bac/objects/82/e3a754b6a0fcb238b03c0e47d05219fbf9cf89 b/app/.git_bac/objects/82/e3a754b6a0fcb238b03c0e47d05219fbf9cf89 deleted file mode 100644 index fb4df06..0000000 Binary files a/app/.git_bac/objects/82/e3a754b6a0fcb238b03c0e47d05219fbf9cf89 and /dev/null differ diff --git a/app/.git_bac/objects/87/6177c3a05720b29c6e992af5d8685dc6fb503c b/app/.git_bac/objects/87/6177c3a05720b29c6e992af5d8685dc6fb503c deleted file mode 100644 index 63d05a2..0000000 Binary files a/app/.git_bac/objects/87/6177c3a05720b29c6e992af5d8685dc6fb503c and /dev/null differ diff --git a/app/.git_bac/objects/8a/3145dccd6d6e54c51c4052b482cb4d1db86caf b/app/.git_bac/objects/8a/3145dccd6d6e54c51c4052b482cb4d1db86caf deleted file mode 100644 index 8537072..0000000 Binary files a/app/.git_bac/objects/8a/3145dccd6d6e54c51c4052b482cb4d1db86caf and /dev/null differ diff --git a/app/.git_bac/objects/8e/4b22900b0c4ebd7dcae52f18266c1ab85afec5 b/app/.git_bac/objects/8e/4b22900b0c4ebd7dcae52f18266c1ab85afec5 deleted file mode 100644 index 260085b..0000000 Binary files a/app/.git_bac/objects/8e/4b22900b0c4ebd7dcae52f18266c1ab85afec5 and /dev/null differ diff --git a/app/.git_bac/objects/8e/96873a2602425867e08b7c3602a0e5d2e5b2d3 b/app/.git_bac/objects/8e/96873a2602425867e08b7c3602a0e5d2e5b2d3 deleted file mode 100644 index 6808adb..0000000 Binary files a/app/.git_bac/objects/8e/96873a2602425867e08b7c3602a0e5d2e5b2d3 and /dev/null differ diff --git a/app/.git_bac/objects/8e/db901712778298aefbd4956268be1c6f9ae428 b/app/.git_bac/objects/8e/db901712778298aefbd4956268be1c6f9ae428 deleted file mode 100644 index af24565..0000000 Binary files a/app/.git_bac/objects/8e/db901712778298aefbd4956268be1c6f9ae428 and /dev/null differ diff --git a/app/.git_bac/objects/96/d26dc83d31d13ff129925d1e687a7a3d8643ce b/app/.git_bac/objects/96/d26dc83d31d13ff129925d1e687a7a3d8643ce deleted file mode 100644 index c7ff940..0000000 Binary files a/app/.git_bac/objects/96/d26dc83d31d13ff129925d1e687a7a3d8643ce and /dev/null differ diff --git a/app/.git_bac/objects/99/82c218d6969c72d4c91e3834e3f535e2dfe68b b/app/.git_bac/objects/99/82c218d6969c72d4c91e3834e3f535e2dfe68b deleted file mode 100644 index 15c409e..0000000 --- a/app/.git_bac/objects/99/82c218d6969c72d4c91e3834e3f535e2dfe68b +++ /dev/null @@ -1,2 +0,0 @@ -x=M 0D=WAH x -RiD]Pwߕ7Up4'V_/PH)/ SPB1|mL׃R2qŶ0ɕgt;/GO+ " ݜÅR`ޡ}~NǫI[}A1Wn$nfFE \ No newline at end of file diff --git a/app/.git_bac/objects/9e/7162f0b01d8778e236e79f4121e0926f68c194 b/app/.git_bac/objects/9e/7162f0b01d8778e236e79f4121e0926f68c194 deleted file mode 100644 index 12286bc..0000000 Binary files a/app/.git_bac/objects/9e/7162f0b01d8778e236e79f4121e0926f68c194 and /dev/null differ diff --git a/app/.git_bac/objects/a0/a17a0847b5572883f74fab89c95f4fff8590f3 b/app/.git_bac/objects/a0/a17a0847b5572883f74fab89c95f4fff8590f3 deleted file mode 100644 index 4c87d2a..0000000 --- a/app/.git_bac/objects/a0/a17a0847b5572883f74fab89c95f4fff8590f3 +++ /dev/null @@ -1,2 +0,0 @@ -xMA0 =+&^L& -LǶtVZ/pIc ?khlz'_iq!ՍゾvSScaC΄`1&[GgVQX.:e3Z -hƢD48;INp}uY+WęZu4p!Q8b]FXk7+edf0fҼ5AE`|?ծ.#rޠ Olh \ No newline at end of file diff --git a/app/.git_bac/objects/b5/664bada7141bc05c31283f159cf66dd997b3ca b/app/.git_bac/objects/b5/664bada7141bc05c31283f159cf66dd997b3ca deleted file mode 100644 index 46e711b..0000000 Binary files a/app/.git_bac/objects/b5/664bada7141bc05c31283f159cf66dd997b3ca and /dev/null differ diff --git a/app/.git_bac/objects/bc/80860bc37ed7ebc5f2e327e5d054fdab5b658d b/app/.git_bac/objects/bc/80860bc37ed7ebc5f2e327e5d054fdab5b658d deleted file mode 100644 index 9fb1a6d..0000000 Binary files a/app/.git_bac/objects/bc/80860bc37ed7ebc5f2e327e5d054fdab5b658d and /dev/null differ diff --git a/app/.git_bac/objects/c3/19176505d2ae638a6ff4be5fd9dcf789f836cb b/app/.git_bac/objects/c3/19176505d2ae638a6ff4be5fd9dcf789f836cb deleted file mode 100644 index 5777cf3..0000000 Binary files a/app/.git_bac/objects/c3/19176505d2ae638a6ff4be5fd9dcf789f836cb and /dev/null differ diff --git a/app/.git_bac/objects/c3/283aa2e33bc813c55504d6c5a7a26653bd3dde b/app/.git_bac/objects/c3/283aa2e33bc813c55504d6c5a7a26653bd3dde deleted file mode 100644 index 5c9abd6..0000000 Binary files a/app/.git_bac/objects/c3/283aa2e33bc813c55504d6c5a7a26653bd3dde and /dev/null differ diff --git a/app/.git_bac/objects/c8/2beff2f61ecba4bc00aab90fcca4740e8078e1 b/app/.git_bac/objects/c8/2beff2f61ecba4bc00aab90fcca4740e8078e1 deleted file mode 100644 index abbeee1..0000000 Binary files a/app/.git_bac/objects/c8/2beff2f61ecba4bc00aab90fcca4740e8078e1 and /dev/null differ diff --git a/app/.git_bac/objects/c9/33dc535d0d19032f851d0aad82ae768fba6968 b/app/.git_bac/objects/c9/33dc535d0d19032f851d0aad82ae768fba6968 deleted file mode 100644 index 163c474..0000000 --- a/app/.git_bac/objects/c9/33dc535d0d19032f851d0aad82ae768fba6968 +++ /dev/null @@ -1,4 +0,0 @@ -xPKK@bZ I@/EZ[E)q%1i&3q7iQe"IM!n[Ta\GT:O夢$ -sܳIy7kR2BA*3,A0}XZ)aUI**eqa9| 0(x-!Ƣᷭ,5r CG0` -~VR!. ]ŷ<`iUXV (n*0Jڒ'"u`]c x jAcfrJ9(|( )k] -#,S;N=\` *OՁG&T \ No newline at end of file diff --git a/app/.git_bac/objects/fc/40641dc609f1bdaa7fd21b1ca1e185d064ebaa b/app/.git_bac/objects/fc/40641dc609f1bdaa7fd21b1ca1e185d064ebaa deleted file mode 100644 index 0c18475..0000000 Binary files a/app/.git_bac/objects/fc/40641dc609f1bdaa7fd21b1ca1e185d064ebaa and /dev/null differ diff --git a/app/.git_bac/refs/heads/master b/app/.git_bac/refs/heads/master deleted file mode 100644 index 8d1b653..0000000 --- a/app/.git_bac/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -e4ac978bf87e9f4c955753b40e8ac23e5e5ef033 diff --git a/app/.gitignore_bac b/app/.gitignore similarity index 87% rename from app/.gitignore_bac rename to app/.gitignore index b5664ba..cd978ea 100644 --- a/app/.gitignore_bac +++ b/app/.gitignore @@ -1,4 +1,3 @@ - ###> symfony/framework-bundle ### /.env.local /.env.local.php @@ -10,11 +9,11 @@ ###< symfony/framework-bundle ### ###> symfony/phpunit-bridge ### -.phpunit.result.cache +/.phpunit.result.cache /phpunit.xml ###< symfony/phpunit-bridge ### ###> phpunit/phpunit ### /phpunit.xml -.phpunit.result.cache +/.phpunit.result.cache ###< phpunit/phpunit ### diff --git a/app/composer.json b/app/composer.json index cecc464..c2261e1 100644 --- a/app/composer.json +++ b/app/composer.json @@ -27,7 +27,7 @@ "symfony/intl": "5.3.*", "symfony/mailer": "5.3.*", "symfony/mime": "5.3.*", - "symfony/monolog-bundle": "^3.1", + "symfony/monolog-bundle": "^3.7", "symfony/notifier": "5.3.*", "symfony/process": "5.3.*", "symfony/property-access": "5.3.*", diff --git a/app/migrations/Version20210731104222.php b/app/migrations/Version20210731104222.php new file mode 100644 index 0000000..4516723 --- /dev/null +++ b/app/migrations/Version20210731104222.php @@ -0,0 +1,31 @@ +addSql('CREATE TABLE user (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(180) NOT NULL, roles JSON NOT NULL, password VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('DROP TABLE user'); + } +} diff --git a/app/migrations/Version20210731104740.php b/app/migrations/Version20210731104740.php new file mode 100644 index 0000000..f74280d --- /dev/null +++ b/app/migrations/Version20210731104740.php @@ -0,0 +1,31 @@ +addSql('CREATE TABLE client (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, city VARCHAR(100) DEFAULT NULL, photo VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('DROP TABLE client'); + } +} diff --git a/app/migrations/Version20210731211742.php b/app/migrations/Version20210731211742.php new file mode 100644 index 0000000..2e92824 --- /dev/null +++ b/app/migrations/Version20210731211742.php @@ -0,0 +1,33 @@ +addSql('CREATE TABLE insurance_objects_types (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(100) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE insurance_objects_types_fields (id INT AUTO_INCREMENT NOT NULL, insurance_object_type_id INT NOT NULL, field_name VARCHAR(100) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('DROP TABLE insurance_objects_types'); + $this->addSql('DROP TABLE insurance_objects_types_fields'); + } +} diff --git a/app/migrations/Version20210801053558.php b/app/migrations/Version20210801053558.php new file mode 100644 index 0000000..5dce6ff --- /dev/null +++ b/app/migrations/Version20210801053558.php @@ -0,0 +1,31 @@ +addSql('CREATE TABLE client_insurance (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, insurance_objects_types_id INT NOT NULL, address VARCHAR(255) DEFAULT NULL, dwelling_limit VARCHAR(255) DEFAULT NULL, other_structures_limit VARCHAR(255) DEFAULT NULL, personal_property_limit VARCHAR(255) DEFAULT NULL, deductible VARCHAR(255) DEFAULT NULL, premium VARCHAR(255) DEFAULT NULL, total_cars VARCHAR(255) DEFAULT NULL, total_drivers VARCHAR(255) DEFAULT NULL, deductible_premium VARCHAR(255) DEFAULT NULL, fine_art VARCHAR(255) DEFAULT NULL, jewelry VARCHAR(255) DEFAULT NULL, wine VARCHAR(255) DEFAULT NULL, etc VARCHAR(255) DEFAULT NULL, each_with_rlp VARCHAR(255) DEFAULT NULL, express_limit VARCHAR(255) DEFAULT NULL, homes_listed VARCHAR(255) DEFAULT NULL, llcs VARCHAR(255) DEFAULT NULL, year VARCHAR(255) DEFAULT NULL, name VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('DROP TABLE client_insurance'); + } +} diff --git a/app/public/uploads/photos/015abf809dda.jpg b/app/public/uploads/photos/015abf809dda.jpg new file mode 100644 index 0000000..a377f58 Binary files /dev/null and b/app/public/uploads/photos/015abf809dda.jpg differ diff --git a/app/public/uploads/photos/0391a76463a1.png b/app/public/uploads/photos/0391a76463a1.png new file mode 100644 index 0000000..ed5f082 Binary files /dev/null and b/app/public/uploads/photos/0391a76463a1.png differ diff --git a/app/public/uploads/photos/03dc9006522b.jpg b/app/public/uploads/photos/03dc9006522b.jpg new file mode 100644 index 0000000..d57fdcc Binary files /dev/null and b/app/public/uploads/photos/03dc9006522b.jpg differ diff --git a/app/public/uploads/photos/04105a80b425.jpg b/app/public/uploads/photos/04105a80b425.jpg new file mode 100755 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/04105a80b425.jpg differ diff --git a/app/public/uploads/photos/0a1cd85c436a.jpg b/app/public/uploads/photos/0a1cd85c436a.jpg new file mode 100755 index 0000000..c2f553e Binary files /dev/null and b/app/public/uploads/photos/0a1cd85c436a.jpg differ diff --git a/app/public/uploads/photos/15502f4e294b.jpg b/app/public/uploads/photos/15502f4e294b.jpg new file mode 100644 index 0000000..b361e84 Binary files /dev/null and b/app/public/uploads/photos/15502f4e294b.jpg differ diff --git a/app/public/uploads/photos/1ade6a14a9c9.png b/app/public/uploads/photos/1ade6a14a9c9.png new file mode 100644 index 0000000..0fdb76a Binary files /dev/null and b/app/public/uploads/photos/1ade6a14a9c9.png differ diff --git a/app/public/uploads/photos/1dca52d3725e.png b/app/public/uploads/photos/1dca52d3725e.png new file mode 100644 index 0000000..89de5df Binary files /dev/null and b/app/public/uploads/photos/1dca52d3725e.png differ diff --git a/app/public/uploads/photos/269fafbbcd2a.jpg b/app/public/uploads/photos/269fafbbcd2a.jpg new file mode 100644 index 0000000..d57fdcc Binary files /dev/null and b/app/public/uploads/photos/269fafbbcd2a.jpg differ diff --git a/app/public/uploads/photos/30768096a744.jpg b/app/public/uploads/photos/30768096a744.jpg new file mode 100644 index 0000000..1098bce Binary files /dev/null and b/app/public/uploads/photos/30768096a744.jpg differ diff --git a/app/public/uploads/photos/377a4cda78a6.png b/app/public/uploads/photos/377a4cda78a6.png new file mode 100644 index 0000000..a3888cd Binary files /dev/null and b/app/public/uploads/photos/377a4cda78a6.png differ diff --git a/app/public/uploads/photos/3d170b5efd13066e28fefd24eafbfd88.png b/app/public/uploads/photos/3d170b5efd13066e28fefd24eafbfd88.png new file mode 100755 index 0000000..d7db4dc Binary files /dev/null and b/app/public/uploads/photos/3d170b5efd13066e28fefd24eafbfd88.png differ diff --git a/app/public/uploads/photos/3d4e81627347d14bf7b706a4714e78f0.png b/app/public/uploads/photos/3d4e81627347d14bf7b706a4714e78f0.png new file mode 100755 index 0000000..70c632d Binary files /dev/null and b/app/public/uploads/photos/3d4e81627347d14bf7b706a4714e78f0.png differ diff --git a/app/public/uploads/photos/3e0c1f43a360.jpg b/app/public/uploads/photos/3e0c1f43a360.jpg new file mode 100644 index 0000000..8f4112a Binary files /dev/null and b/app/public/uploads/photos/3e0c1f43a360.jpg differ diff --git a/app/public/uploads/photos/455bec6c7f09.png b/app/public/uploads/photos/455bec6c7f09.png new file mode 100644 index 0000000..ed5f082 Binary files /dev/null and b/app/public/uploads/photos/455bec6c7f09.png differ diff --git a/app/public/uploads/photos/4cba61d75642.png b/app/public/uploads/photos/4cba61d75642.png new file mode 100644 index 0000000..a7bde1d Binary files /dev/null and b/app/public/uploads/photos/4cba61d75642.png differ diff --git a/app/public/uploads/photos/5056248912a9.jpg b/app/public/uploads/photos/5056248912a9.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/5056248912a9.jpg differ diff --git a/app/public/uploads/photos/6297a7ec00bf.jpg b/app/public/uploads/photos/6297a7ec00bf.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/6297a7ec00bf.jpg differ diff --git a/app/public/uploads/photos/69e110857499.png b/app/public/uploads/photos/69e110857499.png new file mode 100644 index 0000000..ed5f082 Binary files /dev/null and b/app/public/uploads/photos/69e110857499.png differ diff --git a/app/public/uploads/photos/6ad4f458e1fb.jpg b/app/public/uploads/photos/6ad4f458e1fb.jpg new file mode 100644 index 0000000..8a9f863 Binary files /dev/null and b/app/public/uploads/photos/6ad4f458e1fb.jpg differ diff --git a/app/public/uploads/photos/6f3fda7d26ef.png b/app/public/uploads/photos/6f3fda7d26ef.png new file mode 100644 index 0000000..89de5df Binary files /dev/null and b/app/public/uploads/photos/6f3fda7d26ef.png differ diff --git a/app/public/uploads/photos/7060316561c9a3a1173335b01714c11f.png b/app/public/uploads/photos/7060316561c9a3a1173335b01714c11f.png new file mode 100755 index 0000000..9ecbb46 Binary files /dev/null and b/app/public/uploads/photos/7060316561c9a3a1173335b01714c11f.png differ diff --git a/app/public/uploads/photos/7118d1327484.png b/app/public/uploads/photos/7118d1327484.png new file mode 100644 index 0000000..6abef7a Binary files /dev/null and b/app/public/uploads/photos/7118d1327484.png differ diff --git a/app/public/uploads/photos/748330fdb3ef.jpg b/app/public/uploads/photos/748330fdb3ef.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/748330fdb3ef.jpg differ diff --git a/app/public/uploads/photos/754f35102a5c.jpg b/app/public/uploads/photos/754f35102a5c.jpg new file mode 100755 index 0000000..fe2a62e Binary files /dev/null and b/app/public/uploads/photos/754f35102a5c.jpg differ diff --git a/app/public/uploads/photos/77568843f8ac.jpg b/app/public/uploads/photos/77568843f8ac.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/77568843f8ac.jpg differ diff --git a/app/public/uploads/photos/78d04b0789fc.jpg b/app/public/uploads/photos/78d04b0789fc.jpg new file mode 100644 index 0000000..2a8804c Binary files /dev/null and b/app/public/uploads/photos/78d04b0789fc.jpg differ diff --git a/app/public/uploads/photos/818f6e16396d.jpg b/app/public/uploads/photos/818f6e16396d.jpg new file mode 100644 index 0000000..8f4112a Binary files /dev/null and b/app/public/uploads/photos/818f6e16396d.jpg differ diff --git a/app/public/uploads/photos/8523ddeb7111.jpg b/app/public/uploads/photos/8523ddeb7111.jpg new file mode 100644 index 0000000..8f4112a Binary files /dev/null and b/app/public/uploads/photos/8523ddeb7111.jpg differ diff --git a/app/public/uploads/photos/852c9b3cb1db.png b/app/public/uploads/photos/852c9b3cb1db.png new file mode 100644 index 0000000..0fdb76a Binary files /dev/null and b/app/public/uploads/photos/852c9b3cb1db.png differ diff --git a/app/public/uploads/photos/899720bfdf6f91353f02f6f22cc99441.png b/app/public/uploads/photos/899720bfdf6f91353f02f6f22cc99441.png new file mode 100755 index 0000000..90a8e5a Binary files /dev/null and b/app/public/uploads/photos/899720bfdf6f91353f02f6f22cc99441.png differ diff --git a/app/public/uploads/photos/8aadb1a76ce4.jpg b/app/public/uploads/photos/8aadb1a76ce4.jpg new file mode 100755 index 0000000..37dc934 Binary files /dev/null and b/app/public/uploads/photos/8aadb1a76ce4.jpg differ diff --git a/app/public/uploads/photos/8bd9bd279aa87813f2030f110069b5b4.png b/app/public/uploads/photos/8bd9bd279aa87813f2030f110069b5b4.png new file mode 100755 index 0000000..3e4ee0a Binary files /dev/null and b/app/public/uploads/photos/8bd9bd279aa87813f2030f110069b5b4.png differ diff --git a/app/public/uploads/photos/90f0be7ee42e421c4f3b8b036f042a09.png b/app/public/uploads/photos/90f0be7ee42e421c4f3b8b036f042a09.png new file mode 100755 index 0000000..fec5fa1 Binary files /dev/null and b/app/public/uploads/photos/90f0be7ee42e421c4f3b8b036f042a09.png differ diff --git a/app/public/uploads/photos/947cb9669230.jpg b/app/public/uploads/photos/947cb9669230.jpg new file mode 100644 index 0000000..736621c Binary files /dev/null and b/app/public/uploads/photos/947cb9669230.jpg differ diff --git a/app/public/uploads/photos/9979e0320544.jpg b/app/public/uploads/photos/9979e0320544.jpg new file mode 100755 index 0000000..fa4cb06 Binary files /dev/null and b/app/public/uploads/photos/9979e0320544.jpg differ diff --git a/app/public/uploads/photos/9b01ec35a4d6.jpg b/app/public/uploads/photos/9b01ec35a4d6.jpg new file mode 100755 index 0000000..37dc934 Binary files /dev/null and b/app/public/uploads/photos/9b01ec35a4d6.jpg differ diff --git a/app/public/uploads/photos/9b295eccc2be.jpg b/app/public/uploads/photos/9b295eccc2be.jpg new file mode 100644 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/9b295eccc2be.jpg differ diff --git a/app/public/uploads/photos/9b5c1999cd74.jpg b/app/public/uploads/photos/9b5c1999cd74.jpg new file mode 100755 index 0000000..9ab634b Binary files /dev/null and b/app/public/uploads/photos/9b5c1999cd74.jpg differ diff --git a/app/public/uploads/photos/9ddd72fa8afc.png b/app/public/uploads/photos/9ddd72fa8afc.png new file mode 100644 index 0000000..0881ca2 Binary files /dev/null and b/app/public/uploads/photos/9ddd72fa8afc.png differ diff --git a/app/public/uploads/photos/9f3c7f341151.jpg b/app/public/uploads/photos/9f3c7f341151.jpg new file mode 100644 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/9f3c7f341151.jpg differ diff --git a/app/public/uploads/photos/a90de46ca5c3.jpg b/app/public/uploads/photos/a90de46ca5c3.jpg new file mode 100644 index 0000000..67cdc75 Binary files /dev/null and b/app/public/uploads/photos/a90de46ca5c3.jpg differ diff --git a/app/public/uploads/photos/a94cba2a83ce.png b/app/public/uploads/photos/a94cba2a83ce.png new file mode 100644 index 0000000..ed5f082 Binary files /dev/null and b/app/public/uploads/photos/a94cba2a83ce.png differ diff --git a/app/public/uploads/photos/ad181931c438.jpg b/app/public/uploads/photos/ad181931c438.jpg new file mode 100644 index 0000000..d57fdcc Binary files /dev/null and b/app/public/uploads/photos/ad181931c438.jpg differ diff --git a/app/public/uploads/photos/b32a97f8f7b9.jpg b/app/public/uploads/photos/b32a97f8f7b9.jpg new file mode 100644 index 0000000..2a8804c Binary files /dev/null and b/app/public/uploads/photos/b32a97f8f7b9.jpg differ diff --git a/app/public/uploads/photos/b3fd3efa4692.jpg b/app/public/uploads/photos/b3fd3efa4692.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/b3fd3efa4692.jpg differ diff --git a/app/public/uploads/photos/b8e39e36638d.jpg b/app/public/uploads/photos/b8e39e36638d.jpg new file mode 100644 index 0000000..b41c1b9 Binary files /dev/null and b/app/public/uploads/photos/b8e39e36638d.jpg differ diff --git a/app/public/uploads/photos/b9a888942b61.jpg b/app/public/uploads/photos/b9a888942b61.jpg new file mode 100644 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/b9a888942b61.jpg differ diff --git a/app/public/uploads/photos/bd8193b17ed178bc8cc320baa303196b.png b/app/public/uploads/photos/bd8193b17ed178bc8cc320baa303196b.png new file mode 100755 index 0000000..6b3fd08 Binary files /dev/null and b/app/public/uploads/photos/bd8193b17ed178bc8cc320baa303196b.png differ diff --git a/app/public/uploads/photos/bf5339d354291fa1c66f33201e4d9e40.png b/app/public/uploads/photos/bf5339d354291fa1c66f33201e4d9e40.png new file mode 100755 index 0000000..2f5d220 Binary files /dev/null and b/app/public/uploads/photos/bf5339d354291fa1c66f33201e4d9e40.png differ diff --git a/app/public/uploads/photos/cdf9d009f55c.jpg b/app/public/uploads/photos/cdf9d009f55c.jpg new file mode 100644 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/cdf9d009f55c.jpg differ diff --git a/app/public/uploads/photos/d2b69da9bac9.jpg b/app/public/uploads/photos/d2b69da9bac9.jpg new file mode 100644 index 0000000..8f4112a Binary files /dev/null and b/app/public/uploads/photos/d2b69da9bac9.jpg differ diff --git a/app/public/uploads/photos/e17fc077d284.jpg b/app/public/uploads/photos/e17fc077d284.jpg new file mode 100755 index 0000000..20ab9b8 Binary files /dev/null and b/app/public/uploads/photos/e17fc077d284.jpg differ diff --git a/app/public/uploads/photos/e3c5875c3125.jpg b/app/public/uploads/photos/e3c5875c3125.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/e3c5875c3125.jpg differ diff --git a/app/public/uploads/photos/e4ca5e2f1e5f.jpg b/app/public/uploads/photos/e4ca5e2f1e5f.jpg new file mode 100644 index 0000000..df2db30 Binary files /dev/null and b/app/public/uploads/photos/e4ca5e2f1e5f.jpg differ diff --git a/app/public/uploads/photos/e941b74b3af5.jpg b/app/public/uploads/photos/e941b74b3af5.jpg new file mode 100644 index 0000000..8f4112a Binary files /dev/null and b/app/public/uploads/photos/e941b74b3af5.jpg differ diff --git a/app/public/uploads/photos/ed5dd86e73ae.png b/app/public/uploads/photos/ed5dd86e73ae.png new file mode 100644 index 0000000..ed5f082 Binary files /dev/null and b/app/public/uploads/photos/ed5dd86e73ae.png differ diff --git a/app/public/uploads/photos/f73235cd2dc9.jpg b/app/public/uploads/photos/f73235cd2dc9.jpg new file mode 100755 index 0000000..37dc934 Binary files /dev/null and b/app/public/uploads/photos/f73235cd2dc9.jpg differ diff --git a/app/public/uploads/photos/f9758a98340b.png b/app/public/uploads/photos/f9758a98340b.png new file mode 100644 index 0000000..89de5df Binary files /dev/null and b/app/public/uploads/photos/f9758a98340b.png differ diff --git a/app/public/uploads/photos/fe8af779a156.jpg b/app/public/uploads/photos/fe8af779a156.jpg new file mode 100644 index 0000000..d93917d Binary files /dev/null and b/app/public/uploads/photos/fe8af779a156.jpg differ diff --git a/app/public/uploads/photos/ff5a4c8f234d.jpg b/app/public/uploads/photos/ff5a4c8f234d.jpg new file mode 100755 index 0000000..37dc934 Binary files /dev/null and b/app/public/uploads/photos/ff5a4c8f234d.jpg differ diff --git a/app/public/uploads/photos/ff79657e0334.jpg b/app/public/uploads/photos/ff79657e0334.jpg new file mode 100755 index 0000000..19668e5 Binary files /dev/null and b/app/public/uploads/photos/ff79657e0334.jpg differ diff --git a/app/src/Controller/ClientController.php b/app/src/Controller/ClientController.php index 01d91af..2cd0178 100755 --- a/app/src/Controller/ClientController.php +++ b/app/src/Controller/ClientController.php @@ -501,7 +501,7 @@ public function uploadIns(Request $request, $id, $insId, ClientRepository $clien $attachment->setPath($encodedFileName); $attachment->setInsuranceId($insId); $attachment->setName($fileName); - } + } $entityManager = $this->getDoctrine()->getManager(); $entityManager->persist($attachment); diff --git a/app/src/Controller/RegistrationController.php_bac b/app/src/Controller/RegistrationController.php_bac new file mode 100644 index 0000000..4793007 --- /dev/null +++ b/app/src/Controller/RegistrationController.php_bac @@ -0,0 +1,43 @@ +createForm(RegistrationFormType::class, $user); + $form->handleRequest($request); + + if ($form->isSubmitted() && $form->isValid()) { + // encode the plain password + $user->setPassword( + $passwordEncoder->encodePassword( + $user, + $form->get('plainPassword')->getData() + ) + ); + + $entityManager = $this->getDoctrine()->getManager(); + $entityManager->persist($user); + $entityManager->flush(); + // do anything else you need here, like send an email + + return $this->redirectToRoute('app_login'); + } + + return $this->render('registration/register.html.twig', [ + 'registrationForm' => $form->createView(), + ]); + } +} diff --git a/app/src/Form/RegistrationFormType.php_bac b/app/src/Form/RegistrationFormType.php_bac new file mode 100644 index 0000000..7459064 --- /dev/null +++ b/app/src/Form/RegistrationFormType.php_bac @@ -0,0 +1,61 @@ +add('email', TextType::class, [ + 'label' => false, + 'attr' => [ + 'placeholder' => 'Email' + ] + ]) + ->add('plainPassword', PasswordType::class, [ + // instead of being set onto the object directly, + // this is read and encoded in the controller + 'mapped' => false, + 'attr' => [ + 'autocomplete' => 'new-password', + 'placeholder' => 'Plain password' + ], + 'constraints' => [ + new NotBlank([ + 'message' => 'Please enter a password', + ]), + new Length([ + 'min' => 6, + 'minMessage' => 'Your password should be at least {{ limit }} characters', + // max length allowed by Symfony for security reasons + 'max' => 4096, + ]), + ], + 'label' => false + ]) + ->add('submit', SubmitType::class, [ + 'attr' => ['class' => 'btn btn-primary btn-block mt-5'] + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'data_class' => User::class, + ]); + } +} diff --git a/app/src/Security/UserAuthenticator.php b/app/src/Security/UserAuthenticator.php index 938400c..0813bac 100644 --- a/app/src/Security/UserAuthenticator.php +++ b/app/src/Security/UserAuthenticator.php @@ -31,8 +31,8 @@ public function __construct(UrlGeneratorInterface $urlGenerator) public function authenticate(Request $request): PassportInterface { - $email = $request->request->get('email', ''); - $request->getSession()->set(Security::LAST_USERNAME, $email); + $email = $request->request->get('email', ''); + $request->getSession()->set(Security::LAST_USERNAME, $email); return new Passport( new UserBadge($email), diff --git a/app/templates/registration/register.html.twig_bac b/app/templates/registration/register.html.twig_bac new file mode 100644 index 0000000..7053b8d --- /dev/null +++ b/app/templates/registration/register.html.twig_bac @@ -0,0 +1,26 @@ +{% extends 'base.html.twig' %} + +{% block title %}Register{% endblock %} + +{% block body %} +
+
+ +
+
+

Register

+
+
+ {{ form(registrationForm) }} +
+
+
+
+{% endblock %}