popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/raph'

Browse Source
This commit is contained in:
Dobromir Popov
2024-04-05 18:04:33 +03:00
parent 130dc022da adbbb555f9
commit d8a93f9501
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@ -9,9 +9,11 @@ NEXTAUTH_SECRET=ed8a9681efc414df89dfd03cd188ed58
# mysql # mysql
DATABASE_PROVIDER=mysql DATABASE_PROVIDER=mysql
# DATABASE_URL=mysql://cart:cart2023@192.168.0.10:3306/cart_dev # DATABASE_URL=mysql://cart:cart2023@192.168.0.10:3306/cart_dev
DATABASE_URL=mysql://root:Zelen0ku4e@192.168.0.10:3306/cart_dev # DATABASE_URL=mysql://root:Zelen0ku4e@192.168.0.10:3306/cart_dev
# DATABASE_URL=mysql://cart:cartpw@20.101.62.76:3307/cart # DATABASE_URL=mysql://cart:cartpw@20.101.62.76:3307/cart
DATABASE_URL="mysql://root:mdp-11000@127.0.0.1:3306/cart"
# DATABASE_URL=mysql://cart:cartpw@localhost:3306/cart # npx prisma migrate dev # DATABASE_URL=mysql://cart:cartpw@localhost:3306/cart # npx prisma migrate dev
# // owner: dobromir.popov@gmail.com | Специално Свидетелстване София # // owner: dobromir.popov@gmail.com | Специално Свидетелстване София

2
.env.development
View File

@ -1,6 +1,6 @@
NODE_TLS_REJECT_UNAUTHORIZED=0 NODE_TLS_REJECT_UNAUTHORIZED=0
# NODE_EXTRA_CA_CERTS=C:\\Users\\popov\\AppData\\Local\\mkcert # NODE_EXTRA_CA_CERTS=C:\\Users\\popov\\AppData\\Local\\mkcert
PROTOCOL=https PROTOCOL=http
PORT=3003 PORT=3003
HOST=localhost HOST=localhost
NEXT_PUBLIC_PUBLIC_URL=https://localhost:3003 NEXT_PUBLIC_PUBLIC_URL=https://localhost:3003

2
components/availability/AvailabilityForm.js
View File

@ -25,6 +25,8 @@ export default function AvailabilityForm({ publisherId, existingItems, inline, o
indexUrl: "/cart/availabilities" indexUrl: "/cart/availabilities"
}; };
existingitems = existingitems || [];
const [editMode, setEditMode] = useState(existingItems.length > 0); const [editMode, setEditMode] = useState(existingItems.length > 0);
const [publisher, setPublisher] = useState({ id: publisherId }); const [publisher, setPublisher] = useState({ id: publisherId });
const [day, setDay] = useState(new Date(date)); const [day, setDay] = useState(new Date(date));

4
components/calendar/avcalendar.tsx
View File

@ -57,13 +57,13 @@ const AvCalendar = ({ publisherId, events, selectedDate }) => {
// Update internal state when `events` prop changes // Update internal state when `events` prop changes
useEffect(() => { useEffect(() => {
//if we have isBySystem - set type to assignment //if we have isBySystem - set type to assignment
let updatedEvents = events.map(event => { let updatedEvents = events?.map(event => {
if (event.isBySystem) { if (event.isBySystem) {
event.type = "assignment"; event.type = "assignment";
} }
return event; return event;
}); });
updatedEvents = events.map(event => ({ updatedEvents = events?.map(event => ({
...event, ...event,
date: new Date(event.startTime).setHours(0, 0, 0, 0), date: new Date(event.startTime).setHours(0, 0, 0, 0),
startTime: new Date(event.startTime), startTime: new Date(event.startTime),

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "pwwa", "name": "pwwa",
"version": "1.1.1", "version": "1.1.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pwwa", "name": "pwwa",
"version": "1.1.1", "version": "1.1.2",
"dependencies": { "dependencies": {
"@auth/prisma-adapter": "^1.4.0", "@auth/prisma-adapter": "^1.4.0",
"@emotion/react": "^11.11.3", "@emotion/react": "^11.11.3",