diff --git a/public/template-test.html b/_not-used_archive/template-test.html similarity index 100% rename from public/template-test.html rename to _not-used_archive/template-test.html diff --git a/package.json b/package.json index 38f2e56..5b07740 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "omapp", + "name": "ohmnews", "version": "1.0.0", - "description": "ohm-management app for a alternative communication and organization", + "description": "ohm-information app for smarter and more intuitive information and organization", "main": "server.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -13,7 +13,7 @@ }, "keywords": [ "ohm", - "management", + "news", "app" ], "author": "Barbalan, Gruenzinger, Mandutz, Pham, Roemmelt", diff --git a/public/1.json b/public/data-msg/1.json similarity index 100% rename from public/1.json rename to public/data-msg/1.json diff --git a/public/2.json b/public/data-msg/2.json similarity index 100% rename from public/2.json rename to public/data-msg/2.json diff --git a/public/3.json b/public/data-msg/3.json similarity index 100% rename from public/3.json rename to public/data-msg/3.json diff --git a/public/list.json b/public/data-msg/list.json similarity index 100% rename from public/list.json rename to public/data-msg/list.json diff --git a/public/messageData.json b/public/data-msg/messageData.json similarity index 100% rename from public/messageData.json rename to public/data-msg/messageData.json diff --git a/public/font/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 b/public/font/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 new file mode 100644 index 0000000..8dceabc Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmEU9fBBc4.woff2 differ diff --git a/public/font/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 b/public/font/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 new file mode 100644 index 0000000..38f9f3c Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmEU9fChc4EsA.woff2 differ diff --git a/public/font/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 b/public/font/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 new file mode 100644 index 0000000..52c5845 Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 differ diff --git a/public/font/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 b/public/font/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 new file mode 100644 index 0000000..f12280d Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 differ diff --git a/public/font/KFOlCnqEu92Fr1MmWUlfBBc4.woff2 b/public/font/KFOlCnqEu92Fr1MmWUlfBBc4.woff2 new file mode 100644 index 0000000..e327dc9 Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmWUlfBBc4.woff2 differ diff --git a/public/font/KFOlCnqEu92Fr1MmWUlfChc4EsA.woff2 b/public/font/KFOlCnqEu92Fr1MmWUlfChc4EsA.woff2 new file mode 100644 index 0000000..6f12d07 Binary files /dev/null and b/public/font/KFOlCnqEu92Fr1MmWUlfChc4EsA.woff2 differ diff --git a/public/font/KFOmCnqEu92Fr1Mu4mxK.woff2 b/public/font/KFOmCnqEu92Fr1Mu4mxK.woff2 new file mode 100644 index 0000000..7e854e6 Binary files /dev/null and b/public/font/KFOmCnqEu92Fr1Mu4mxK.woff2 differ diff --git a/public/font/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 b/public/font/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 new file mode 100644 index 0000000..d9db31a Binary files /dev/null and b/public/font/KFOmCnqEu92Fr1Mu7GxKOzY.woff2 differ diff --git a/public/font/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 b/public/font/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 new file mode 100644 index 0000000..2491c51 Binary files /dev/null and b/public/font/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 differ diff --git a/public/img/ios-icon/th_ohmicon_152x152.png b/public/img/ios-icon/th_ohmicon_152x152.png deleted file mode 100644 index ea0f54f..0000000 Binary files a/public/img/ios-icon/th_ohmicon_152x152.png and /dev/null differ diff --git a/public/img/ios-icon/th_ohmicon_167x167.png b/public/img/ios-icon/th_ohmicon_167x167.png deleted file mode 100644 index afed731..0000000 Binary files a/public/img/ios-icon/th_ohmicon_167x167.png and /dev/null differ diff --git a/public/img/ios-icon/th_ohmicon_180x180.png b/public/img/ios-icon/th_ohmicon_180x180.png deleted file mode 100644 index 15c7530..0000000 Binary files a/public/img/ios-icon/th_ohmicon_180x180.png and /dev/null differ diff --git a/public/img/ios-icon/th_ohmicon_192x192.png b/public/img/ios-icon/th_ohmicon_192x192.png deleted file mode 100644 index 975869c..0000000 Binary files a/public/img/ios-icon/th_ohmicon_192x192.png and /dev/null differ diff --git a/public/img/launcher/android_launcher_app_icon_192.png b/public/img/launcher/android_launcher_app_icon_192.png new file mode 100644 index 0000000..360265d Binary files /dev/null and b/public/img/launcher/android_launcher_app_icon_192.png differ diff --git a/public/img/launcher/android_launcher_app_icon_512.png b/public/img/launcher/android_launcher_app_icon_512.png new file mode 100644 index 0000000..b9aba43 Binary files /dev/null and b/public/img/launcher/android_launcher_app_icon_512.png differ diff --git a/public/img/launcher/ios_launcher_app_icon_152.png b/public/img/launcher/ios_launcher_app_icon_152.png new file mode 100755 index 0000000..4d18f47 Binary files /dev/null and b/public/img/launcher/ios_launcher_app_icon_152.png differ diff --git a/public/img/launcher/ios_launcher_app_icon_167.png b/public/img/launcher/ios_launcher_app_icon_167.png new file mode 100755 index 0000000..08abf16 Binary files /dev/null and b/public/img/launcher/ios_launcher_app_icon_167.png differ diff --git a/public/img/launcher/ios_launcher_app_icon_180.png b/public/img/launcher/ios_launcher_app_icon_180.png new file mode 100755 index 0000000..6f26712 Binary files /dev/null and b/public/img/launcher/ios_launcher_app_icon_180.png differ diff --git a/public/img/launcher/ios_launcher_app_icon_192.png b/public/img/launcher/ios_launcher_app_icon_192.png new file mode 100755 index 0000000..6ccae78 Binary files /dev/null and b/public/img/launcher/ios_launcher_app_icon_192.png differ diff --git a/public/img/th_nbg_ohmicon_amp.png b/public/img/launcher_app_icon.png similarity index 100% rename from public/img/th_nbg_ohmicon_amp.png rename to public/img/launcher_app_icon.png diff --git a/public/img/profil_icon2.PNG b/public/img/profil_icon.png similarity index 100% rename from public/img/profil_icon2.PNG rename to public/img/profil_icon.png diff --git a/public/index.html b/public/index.html index e17a707..20e4b25 100644 --- a/public/index.html +++ b/public/index.html @@ -8,52 +8,76 @@ +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + +>>>>>>> 7a6d46c85b54e576ce552e15a8938291ab2fd22f - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - + + + + + + + + + -