Backend korrigiert, icons korrigiert, menü-aufklappen verbessert
@@ -20,7 +20,8 @@ const menuStructure = {
|
|||||||
icon: "friends24.png"
|
icon: "friends24.png"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
showLoggedinFriends: 1
|
showLoggedinFriends: 1,
|
||||||
|
icon: "friends24.png"
|
||||||
},
|
},
|
||||||
socialnetwork: {
|
socialnetwork: {
|
||||||
visible: ["all"],
|
visible: ["all"],
|
||||||
@@ -73,7 +74,7 @@ const menuStructure = {
|
|||||||
},
|
},
|
||||||
falukant: {
|
falukant: {
|
||||||
visible: ["all"],
|
visible: ["all"],
|
||||||
icon: "falukant24.png",
|
icon: "falukant16.png",
|
||||||
children: {
|
children: {
|
||||||
create: {
|
create: {
|
||||||
visible: ["nofalukantaccount"],
|
visible: ["nofalukantaccount"],
|
||||||
@@ -135,11 +136,11 @@ const menuStructure = {
|
|||||||
},
|
},
|
||||||
minigames: {
|
minigames: {
|
||||||
visible: ["all"],
|
visible: ["all"],
|
||||||
icon: "minigames24.png",
|
icon: "minigames16.png",
|
||||||
},
|
},
|
||||||
settings: {
|
settings: {
|
||||||
visible: ["all"],
|
visible: ["all"],
|
||||||
icon: "settings24.png",
|
icon: "settings16.png",
|
||||||
children: {
|
children: {
|
||||||
homepage: {
|
homepage: {
|
||||||
visible: ["all"],
|
visible: ["all"],
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ export default function setupAssociations() {
|
|||||||
UserParamType.hasMany(UserParam, { foreignKey: 'paramTypeId', as: 'user_params' });
|
UserParamType.hasMany(UserParam, { foreignKey: 'paramTypeId', as: 'user_params' });
|
||||||
UserParam.belongsTo(UserParamType, { foreignKey: 'paramTypeId', as: 'paramType' });
|
UserParam.belongsTo(UserParamType, { foreignKey: 'paramTypeId', as: 'paramType' });
|
||||||
|
|
||||||
UserParam.belongsTo(SettingsType, { foreignKey: 'settingsId', as: 'settings' });
|
|
||||||
UserParam.belongsTo(User, { foreignKey: 'userId', as: 'user' });
|
UserParam.belongsTo(User, { foreignKey: 'userId', as: 'user' });
|
||||||
|
|
||||||
UserRight.belongsTo(User, { foreignKey: 'userId' });
|
UserRight.belongsTo(User, { foreignKey: 'userId' });
|
||||||
|
|||||||
@@ -63,3 +63,4 @@ const ContactMessage = sequelize.define('contact_message', {
|
|||||||
});
|
});
|
||||||
|
|
||||||
export default ContactMessage;
|
export default ContactMessage;
|
||||||
|
|
||||||
@@ -25,9 +25,8 @@ const initializeDatabase = async () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const syncModels = async (models) => {
|
const syncModels = async (models) => {
|
||||||
// Nur einmaliges sync ohne alter/force
|
|
||||||
for (const model of Object.values(models)) {
|
for (const model of Object.values(models)) {
|
||||||
await model.sync();
|
await model.sync({ alter: true });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
BIN
frontend/public/images/icons/contact16.png
Normal file
|
After Width: | Height: | Size: 4.9 KiB |
BIN
frontend/public/images/icons/contact24.png
Normal file
|
After Width: | Height: | Size: 6.7 KiB |
BIN
frontend/public/images/icons/contactform.png
Normal file
|
After Width: | Height: | Size: 36 KiB |
BIN
frontend/public/images/icons/imprint.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 6.3 KiB |
@@ -123,9 +123,20 @@ a {
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
border: 1px solid #7E471B;
|
border: 1px solid #7E471B;
|
||||||
background-color: #F9A22C;
|
background-color: #F9A22C;
|
||||||
display: none;
|
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 2.5em;
|
top: 2.5em;
|
||||||
|
max-height: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
opacity: 0;
|
||||||
|
visibility: hidden;
|
||||||
|
transition: max-height 0.25s ease-in-out, opacity 0.05s ease-in-out, visibility 0s 0.05s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mainmenuitem:hover .submenu1 {
|
||||||
|
max-height: 500px;
|
||||||
|
opacity: 1;
|
||||||
|
visibility: visible;
|
||||||
|
transition: max-height 0.25s ease-in-out, opacity 0.05s ease-in-out, visibility 0s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.submenu1>li {
|
.submenu1>li {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
v-if="!minimized" ref="dialog">
|
v-if="!minimized" ref="dialog">
|
||||||
<div class="dialog-header" @mousedown="startDragging">
|
<div class="dialog-header" @mousedown="startDragging">
|
||||||
<span v-if="icon" class="dialog-icon">
|
<span v-if="icon" class="dialog-icon">
|
||||||
<img :src="icon" alt="Icon" />
|
<img :src="'/images/icons/' + icon" alt="Icon" />
|
||||||
</span>
|
</span>
|
||||||
<span class="dialog-title">{{ isTitleTranslated ? $t(title) : title }}</span>
|
<span class="dialog-title">{{ isTitleTranslated ? $t(title) : title }}</span>
|
||||||
<span v-if="!modal" class="dialog-minimize" @click="minimize">_</span>
|
<span v-if="!modal" class="dialog-minimize" @click="minimize">_</span>
|
||||||
@@ -193,14 +193,14 @@ export default {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
padding: 10px 20px;
|
padding: 5px 5px;
|
||||||
border-bottom: 1px solid #ddd;
|
border-bottom: 1px solid #ddd;
|
||||||
background-color: #F9A22C;
|
background-color: #F9A22C;
|
||||||
cursor: move;
|
cursor: move;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dialog-icon {
|
.dialog-icon {
|
||||||
margin-right: 10px;
|
padding: 2px 5px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dialog-title {
|
.dialog-title {
|
||||||
@@ -231,16 +231,18 @@ export default {
|
|||||||
|
|
||||||
.dialog-button {
|
.dialog-button {
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
padding: 10px 20px;
|
padding: 5px 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
background: #007bff;
|
background: #F9A22C;
|
||||||
color: white;
|
color: #000000;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
transition: background 0.3s;
|
transition: background 0.02s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dialog-button:hover {
|
.dialog-button:hover {
|
||||||
background: #0056b3;
|
background: #fdf1db;
|
||||||
|
color: #7E471B;
|
||||||
|
border: 1px solid #7E471B;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||