diff --git a/backend/controllers/navigationController.js b/backend/controllers/navigationController.js index 38e93e2..6b65238 100644 --- a/backend/controllers/navigationController.js +++ b/backend/controllers/navigationController.js @@ -20,7 +20,8 @@ const menuStructure = { icon: "friends24.png" } }, - showLoggedinFriends: 1 + showLoggedinFriends: 1, + icon: "friends24.png" }, socialnetwork: { visible: ["all"], @@ -73,7 +74,7 @@ const menuStructure = { }, falukant: { visible: ["all"], - icon: "falukant24.png", + icon: "falukant16.png", children: { create: { visible: ["nofalukantaccount"], @@ -135,11 +136,11 @@ const menuStructure = { }, minigames: { visible: ["all"], - icon: "minigames24.png", + icon: "minigames16.png", }, settings: { visible: ["all"], - icon: "settings24.png", + icon: "settings16.png", children: { homepage: { visible: ["all"], diff --git a/backend/models/associations.js b/backend/models/associations.js index 550bef5..de639a8 100644 --- a/backend/models/associations.js +++ b/backend/models/associations.js @@ -16,7 +16,6 @@ export default function setupAssociations() { UserParamType.hasMany(UserParam, { foreignKey: 'paramTypeId', as: 'user_params' }); UserParam.belongsTo(UserParamType, { foreignKey: 'paramTypeId', as: 'paramType' }); - UserParam.belongsTo(SettingsType, { foreignKey: 'settingsId', as: 'settings' }); UserParam.belongsTo(User, { foreignKey: 'userId', as: 'user' }); UserRight.belongsTo(User, { foreignKey: 'userId' }); diff --git a/backend/models/service/contactmessage.js b/backend/models/service/contactmessage.js index 9061034..f2adae1 100644 --- a/backend/models/service/contactmessage.js +++ b/backend/models/service/contactmessage.js @@ -63,3 +63,4 @@ const ContactMessage = sequelize.define('contact_message', { }); export default ContactMessage; + \ No newline at end of file diff --git a/backend/utils/sequelize.js b/backend/utils/sequelize.js index 6fcd71c..4df21eb 100644 --- a/backend/utils/sequelize.js +++ b/backend/utils/sequelize.js @@ -25,9 +25,8 @@ const initializeDatabase = async () => { }; const syncModels = async (models) => { - // Nur einmaliges sync ohne alter/force for (const model of Object.values(models)) { - await model.sync(); + await model.sync({ alter: true }); } }; diff --git a/frontend/public/images/icons/contact16.png b/frontend/public/images/icons/contact16.png new file mode 100644 index 0000000..a17a670 Binary files /dev/null and b/frontend/public/images/icons/contact16.png differ diff --git a/frontend/public/images/icons/contact24.png b/frontend/public/images/icons/contact24.png new file mode 100644 index 0000000..89ed51a Binary files /dev/null and b/frontend/public/images/icons/contact24.png differ diff --git a/frontend/public/images/icons/contactform.png b/frontend/public/images/icons/contactform.png new file mode 100644 index 0000000..c59a53c Binary files /dev/null and b/frontend/public/images/icons/contactform.png differ diff --git a/frontend/public/images/icons/imprint.png b/frontend/public/images/icons/imprint.png new file mode 100644 index 0000000..f001773 Binary files /dev/null and b/frontend/public/images/icons/imprint.png differ diff --git a/frontend/public/images/icons/imprint16.png b/frontend/public/images/icons/imprint16.png index d00824c..e059d46 100644 Binary files a/frontend/public/images/icons/imprint16.png and b/frontend/public/images/icons/imprint16.png differ diff --git a/frontend/public/images/icons/imprint24.png b/frontend/public/images/icons/imprint24.png index 3b7666d..284e2e7 100644 Binary files a/frontend/public/images/icons/imprint24.png and b/frontend/public/images/icons/imprint24.png differ diff --git a/frontend/src/components/AppNavigation.vue b/frontend/src/components/AppNavigation.vue index ddcc65d..2d57c8e 100644 --- a/frontend/src/components/AppNavigation.vue +++ b/frontend/src/components/AppNavigation.vue @@ -123,9 +123,20 @@ a { position: absolute; border: 1px solid #7E471B; background-color: #F9A22C; - display: none; left: 0; 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 { diff --git a/frontend/src/components/DialogWidget.vue b/frontend/src/components/DialogWidget.vue index 0857a14..e7a9ef3 100644 --- a/frontend/src/components/DialogWidget.vue +++ b/frontend/src/components/DialogWidget.vue @@ -5,7 +5,7 @@ v-if="!minimized" ref="dialog">