test into master #42
|
|
@ -1,5 +1,5 @@
|
|||
# Not using buster because of bug: https://bugs.php.net/bug.php?id=78870
|
||||
FROM debian:stretch-slim
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
|
@ -23,13 +23,13 @@ RUN a2dissite 000-default
|
|||
|
||||
# NodeJs
|
||||
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
||||
&& apt-get install -y --no-install-recommends nodejs
|
||||
|
||||
# Hedera
|
||||
|
||||
RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
|
||||
&& echo "deb http://apt.verdnatura.es/ stretch main" \
|
||||
&& echo "deb http://apt.verdnatura.es/ bookworm main" \
|
||||
> /etc/apt/sources.list.d/vn.list \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ pipeline {
|
|||
}
|
||||
agent {
|
||||
docker {
|
||||
image 'registry.verdnatura.es/debuild:2.21.3-vn2'
|
||||
image 'registry.verdnatura.es/debuild:2.23.4-vn1'
|
||||
registryUrl 'https://registry.verdnatura.es/'
|
||||
registryCredentialsId 'docker-registry'
|
||||
args '-v /mnt/appdata/reprepro:/reprepro'
|
||||
|
|
@ -46,7 +46,7 @@ pipeline {
|
|||
}
|
||||
steps {
|
||||
sh 'debuild -us -uc -b'
|
||||
sh 'vn-includedeb stretch'
|
||||
sh 'vn-includedeb bookworm'
|
||||
}
|
||||
}
|
||||
stage('Container') {
|
||||
|
|
|
|||
17
README.md
17
README.md
|
|
@ -8,14 +8,25 @@ Required dependencies.
|
|||
* PHP >= 7.0
|
||||
* Node.js >= 8.0
|
||||
|
||||
Launch application for development.
|
||||
### Web application
|
||||
|
||||
Launch fronted.
|
||||
```
|
||||
$ npm run dev
|
||||
npm run front
|
||||
```
|
||||
|
||||
Launch backend.
|
||||
```
|
||||
npm run db
|
||||
npm run back
|
||||
php -S 127.0.0.1:3001 -t . index.php
|
||||
```
|
||||
|
||||
### Command line
|
||||
|
||||
Run server side method from command line.
|
||||
```
|
||||
$ php hedera-web.php -m method_path
|
||||
php hedera-web.php -m method_path
|
||||
```
|
||||
|
||||
## Built with
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
hedera-web (23.6.12) stable; urgency=low
|
||||
hedera-web (23.30.1) stable; urgency=low
|
||||
|
||||
* Initial Release.
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ BecauseOurSalesDep: >-
|
|||
Pour nos professionnels de service commercial qui sera toujours de trouver une
|
||||
solution à vos besoins.
|
||||
BecauseOurWorkShop: Parce que nous avons un atelier de couture pour aider.
|
||||
BecauseWeHaveWhatYouNeed: Parce que nous avons ce que vous avez besoin quand vous en avez besoin ...
|
||||
BecauseWeHaveWhatYouNeed: >-
|
||||
Parce que nous avons ce que vous avez besoin quand vous en avez besoin ...
|
||||
AboutDesc: >-
|
||||
Nous sommes une société spécialisée dans le commerce de gros et de la
|
||||
distribution d'une large gamme d'accessoires, des verts et des fleurs à des
|
||||
|
|
@ -31,6 +32,6 @@ AboutDisp: >-
|
|||
Mercaflor - Mercavalencia (Valencia) qui effectuent des ventes directes
|
||||
seulement.
|
||||
AboutOrder: >-
|
||||
Vous pouvez faire vos commandes et réservations par téléphone au +33 781 533
|
||||
900, en ligne grâce à notre site Internet ou directement dans nos
|
||||
Vous pouvez faire vos commandes et réservations par téléphone au +33 783 285
|
||||
437, en ligne grâce à notre site Internet ou directement dans nos
|
||||
installations.
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@
|
|||
flex: auto;
|
||||
overflow: hidden;
|
||||
margin: 10px;
|
||||
height: 170px;
|
||||
height: 185px;
|
||||
|
||||
& > h2 {
|
||||
max-height: 3rem;
|
||||
|
|
|
|||
|
|
@ -115,7 +115,8 @@
|
|||
WHERE #filter;
|
||||
CALL myOrder_calcCatalogFull(#orderId);
|
||||
SELECT i.id, i.longName item, i.subName,
|
||||
i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7,
|
||||
i.tag5, i.value5, i.tag6, i.value6,
|
||||
i.tag7, i.value7, i.tag8, i.value8,
|
||||
i.relevancy, i.size, i.category,
|
||||
k.name ink, p.name producer, o.name origin,
|
||||
b.available, b.price, b.`grouping`,
|
||||
|
|
@ -186,6 +187,10 @@
|
|||
<td>{{item.tag7}}</td>
|
||||
<td>{{item.value7}}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{item.tag8}}</td>
|
||||
<td>{{item.value8}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="available-price">
|
||||
<span class="grouping" title="_MinimalGrouping">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Remind me: Retenir mon mot de passe
|
|||
Log in as guest: Entrez en tant qu'invité
|
||||
Login: Se connecter
|
||||
Login mail: info@verdnatura.es
|
||||
Login phone: +33 781 533 900
|
||||
Login phone: +33 783 285 437
|
||||
Password forgotten? Push here: Vous avez oublié votre mot de passe?
|
||||
Yet you are not a customer?: Vous n'êtes pas encore client?
|
||||
Sign up: S'inscrire
|
||||
|
|
|
|||
|
|
@ -86,6 +86,7 @@ module.exports = new Class({
|
|||
headers: {'Authorization': token}
|
||||
};
|
||||
await this.post('Accounts/logout', null, config);
|
||||
await this.send('user/logout');
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "hedera-web",
|
||||
"version": "23.6.12",
|
||||
"version": "23.30.1",
|
||||
"description": "Verdnatura web page",
|
||||
"license": "GPL-3.0",
|
||||
"repository": {
|
||||
|
|
@ -21,9 +21,9 @@
|
|||
"html-webpack-plugin": "^5.5.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"mini-css-extract-plugin": "^2.7.0",
|
||||
"node-sass": "^7.0.1",
|
||||
"node-sass": "^9.0.0",
|
||||
"raw-loader": "^4.0.2",
|
||||
"sass-loader": "^12.6.0",
|
||||
"sass-loader": "^13.3.2",
|
||||
"style-loader": "^3.3.1",
|
||||
"url-loader": "^4.1.1",
|
||||
"webpack": "^5.75.0",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<?php
|
||||
|
||||
class Logout extends Vn\Web\JsonRequest {
|
||||
function run($db) {
|
||||
$_SESSION['user'] = null;
|
||||
}
|
||||
}
|
||||
|
|
@ -158,8 +158,10 @@ abstract class Service {
|
|||
[$token]
|
||||
);
|
||||
|
||||
if (!$userId)
|
||||
if (!$userId) {
|
||||
$_SESSION['user'] = null;
|
||||
throw new SessionExpiredException();
|
||||
}
|
||||
|
||||
$anonymousUser = FALSE;
|
||||
$user = $db->getValue(
|
||||
|
|
@ -175,8 +177,10 @@ abstract class Service {
|
|||
[$user]
|
||||
);
|
||||
|
||||
if (!$isActive)
|
||||
if (!$isActive) {
|
||||
$_SESSION['user'] = null;
|
||||
throw new UserDisabledException();
|
||||
}
|
||||
}
|
||||
|
||||
$db->query('CALL account.myUser_loginWithName(#)', [$user]);
|
||||
|
|
@ -187,7 +191,6 @@ abstract class Service {
|
|||
$_SESSION['user'] = $user;
|
||||
|
||||
// Registering the user access
|
||||
|
||||
if (isset($_SESSION['access']) && $userChanged)
|
||||
$db->query(
|
||||
'CALL visitUser_new(#, #)',
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ const devConfig = {
|
|||
proxy: {
|
||||
'/api': 'http://localhost:3000',
|
||||
'/': {
|
||||
target: 'http://localhost/projects/hedera-web',
|
||||
target: 'http://localhost:3001',
|
||||
bypass: (req) => req.path !== '/' ? req.path : null
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue