Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore(frontend|backend|potatl): Bump deps #183

Merged
merged 4 commits into from
May 9, 2024
Merged

chore(frontend|backend|potatl): Bump deps #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e3faee
chore(frontend|backend|potatl): Bump deps
cleptric May 9, 2024
5986625
Tweak feedback colours
cleptric May 9, 2024
854164b
Fix assocation
cleptric May 9, 2024
cda8ac1
Fix phpunit
cleptric May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"php": ">=8.3",
"cakephp/authentication": "^3.0.3",
"cakephp/cakephp": "dev-5.next as 5.0.4",
"cakephp/migrations": "^4.2.0",
"cakephp/migrations": "^4.3.0",
"cakephp/plugin-installer": "^2.0.1",
"lcobucci/jwt": "^5.3",
"paragonie/csp-builder": "^3.0",
"paragonie/csp-builder": "^3.0.1",
"sentry/sentry": "^4.7.0"
},
"require-dev": {
"cakephp/bake": "^3.1.1",
"cakephp/cakephp-codesniffer": "^5.1.1",
"phpstan/phpstan": "^1.10.66",
"phpunit/phpunit": "^10.5.18"
"phpstan/phpstan": "^1.10.67",
"phpunit/phpunit": "^10.5.20"
},
"autoload": {
"psr-4": {
Expand Down
282 changes: 176 additions & 106 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions frontend/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,21 @@ import './assets/main.css'
backgroundHover: '#e4e4e7', // zinc-200
submitBackground: '#fde68a', // amber-200
submitBackgroundHover: '#fcd34d', // amber-300
submitBorder: '#fcd34d', // amber-400
submitBorder: '#fcd34d', // amber-300
submitForeground: '#18181b', // zinc-900
inputBorderFocus: '#fcd34d', // amber-400
submitForegroundHover: '#18181b', // zinc-900
inputBorderFocus: '#fcd34d', // amber-300
},
themeDark: {
foreground: '#fafafa', // zinc-50
background: "#27272a", // zinc-800
backgroundHover: '#3f3f46', // zinc-700
submitBackground: '#fde68a', // amber-200
submitBackgroundHover: '#fcd34d', // amber-300
submitBorder: '#fcd34d', // amber-400
submitBorder: '#fcd34d', // amber-300
submitForeground: '#18181b', // zinc-900
inputBorderFocus: '#fcd34d', // amber-400
submitForegroundHover: '#18181b', // zinc-900
inputBorderFocus: '#fcd34d', // amber-300
},
}),
],
Expand Down
738 changes: 361 additions & 377 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
},
"dependencies": {
"@sentry/vite-plugin": "^2.16.1",
"@sentry/vue": "^8.0.0-beta.1",
"@sentry/vue": "^8.0.0-rc.1",
"axios": "^1.6.8",
"vue": "^3.4.22",
"vue-router": "^4.3.0",
"vue": "^3.4.27",
"vue-router": "^4.3.2",
"vue-select": "^4.0.0-beta.6",
"vuex": "^4.1.0"
},
Expand All @@ -23,11 +23,11 @@
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"autoprefixer": "^10.4.19",
"eslint": "^9.0.0",
"eslint-plugin-vue": "^9.25.0",
"eslint": "^9.2.0",
"eslint-plugin-vue": "^9.26.0",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.3",
"vite": "^5.2.8"
"vite": "^5.2.11"
}
}
6 changes: 3 additions & 3 deletions potal/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (

require (
github.com/gorilla/websocket v1.5.1 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
)
6 changes: 6 additions & 0 deletions potal/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,18 @@ golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14 changes: 2 additions & 12 deletions src/Model/Table/MessagesTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@ public function initialize(array $config): void

$this->addBehavior('Timestamp');

$this->belongsTo('Users', [
'className' => 'Users',
'foreignKey' => 'sender_user_id',
'joinType' => 'INNER',
]);
$this->belongsTo('Users', [
'className' => 'Users',
'foreignKey' => 'receiver_user_id',
'joinType' => 'INNER',
]);
$this->belongsTo('SentUsers', [
'className' => 'Users',
'foreignKey' => 'sender_user_id',
Expand Down Expand Up @@ -106,8 +96,8 @@ public function validationDefault(Validator $validator): Validator
*/
public function buildRules(RulesChecker $rules): RulesChecker
{
$rules->add($rules->existsIn('sender_user_id', 'Users'), ['errorField' => 'sender_user_id']);
$rules->add($rules->existsIn('receiver_user_id', 'Users'), ['errorField' => 'receiver_user_id']);
$rules->add($rules->existsIn('sender_user_id', 'SentUsers'), ['errorField' => 'sender_user_id']);
$rules->add($rules->existsIn('receiver_user_id', 'ReceivedUsers'), ['errorField' => 'receiver_user_id']);

return $rules;
}
Expand Down
Loading