Skip to content

Commit c123e3c

Browse files
committed
fixes + initial positioned models
1 parent 82aed41 commit c123e3c

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

app/site/controllers/Frontend/Users/Login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function beforeRender() : BasePage|Response
120120
$result = $this->template_data['form']->getSubmitResults(static::class . '::formSubmitted');
121121
/** @var Parser $parser */
122122
$parser = $this->getContainer()->get('jwt:configuration')->parser();
123-
$token = $parser->parse($result);
123+
$token = $parser->parse($result)->toString();
124124

125125
$goto_url = $this->getUrl("frontend.users.profile");
126126

docker/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ services:
1818
- database
1919
- elasticsearch
2020
- mailhog
21+
ports:
22+
- 9003:9003
2123
database:
2224
build:
2325
context: ./database

docker/php-fpm/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
FROM php:8.0-fpm-alpine
22

3-
RUN apk add zlib zlib-dev libpng libpng-dev git bash libffi libffi-dev
4-
RUN docker-php-ext-install pdo_mysql gd
3+
RUN apk add zlib zlib-dev libpng libpng-dev git bash libffi libffi-dev libxml2 libxml2-dev libsodium libsodium-dev
4+
RUN docker-php-ext-install pdo_mysql gd pdo fileinfo simplexml sodium
55
RUN apk add composer npm ruby ruby-dev
66
RUN apk add --update build-base libffi-dev
77
RUN apk add --no-cache $PHPIZE_DEPS && pecl install xdebug && docker-php-ext-enable xdebug
8+
RUN docker-php-ext-enable xdebug pdo_mysql gd fileinfo sodium
89
RUN npm install -g gulp
910
RUN gem install compass compass-rgbapng
1011
RUN wget https://phpdoc.org/phpDocumentor.phar -O /usr/local/bin/phpdoc

pub/setup.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
die('Installation already done.');
1313
}
1414

15+
if (isset($_REQUEST['info'])) {
16+
echo phpinfo();
17+
die();
18+
}
19+
1520
if (isset($_GET['step'])) :
1621
$dotenv_sections = [
1722
'Basic Info' => ['APPNAME','APPDOMAIN','SALT'],
@@ -132,7 +137,7 @@
132137
echo json_encode(['html' => '', 'js' => 'window.setTimeout(function(){loadStep(7, "Run migrations");}, 1000);']);
133138
elseif ($_GET['step'] == 7) :
134139
// run migrations
135-
140+
136141
$commands = [
137142
'bin/console db:migrate',
138143
];
@@ -153,7 +158,7 @@
153158
echo json_encode(['html' => '<pre>'.$html.'</pre><button class="btn btn-primary" id="continuebtn">Continue</button>', 'js' => '$(\'#continuebtn\').click(function(){loadStep(8, "And that\'s it");});']);
154159
elseif ($_GET['step'] == 8) :
155160
// TYP
156-
161+
157162
touch('.install_done');
158163
echo json_encode(['html' => 'Enjoy your site.', 'js' => 'window.setTimeout(function(){ document.location = \'/\';}, 5000);']);
159164
endif;
@@ -165,7 +170,7 @@
165170
<meta charset="utf-8">
166171
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
167172
<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
168-
<link href="https://fonts.googleapis.com/css?family=Raleway&display=swap" rel="stylesheet">
173+
<link href="https://fonts.googleapis.com/css?family=Raleway&display=swap" rel="stylesheet">
169174
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
170175
<style type="text/css">
171176
body {
@@ -263,4 +268,4 @@ function loadStep(numstep, title, clear, formdata) {
263268
</script>
264269
</body>
265270
</html>
266-
<?php endif;
271+
<?php endif;

0 commit comments

Comments
 (0)