+ 
-## About
+
MaMpf
+Mathematische Medienplattform
+ -MaMpf (*Mathematische Medienplattform*) is an innovative open source E-Learning platform for the mathematical sciences. +## 💡 About + +**MaMpf (*Mathematische Medienplattform*)** is an innovative open source E-Learning platform for the mathematical sciences. Central point is the interconnection between different content in the sense of a hypermedia system. @@ -46,18 +51,19 @@ There you can also find a [screenshot gallery](https://mampfdev.wordpress.com/ga MaMpf is implemented in Ruby on Rails. -* Ruby version: 3.0.3 -* Rails Version: 7.0.2.3 +* Ruby version: 3.1.4 +* Rails Version: 7.0.4.3 * Test suite: rspec, cypress * support for I18n -## Installation (with docker-compose) +## 💻 Installation (with docker compose) + +To easily try out MaMpf you can use `docker compose`. Clone the MaMpf repository and run `docker compose`: -To simply try out mampf you can use docker-compose. Simply clone the mampf repository and run docker-compose by executing ``` -git clone -b main --recursive git@github.com:fosterfarrell9/mampf.git +git clone -b main --recursive https://github.com/MaMpf-HD/mampf.git cd mampf/docker/development/ -docker-compose up +docker compose up ``` -For more information about that visit [INSTALL.md](./INSTALL.md). +See the full installation guide [here](./INSTALL.md). diff --git a/app/assets/images/MaMpf-Logo.svg b/app/assets/images/MaMpf-Logo.svg new file mode 100644 index 000000000..1dc830fd5 --- /dev/null +++ b/app/assets/images/MaMpf-Logo.svg @@ -0,0 +1,111 @@ + + + + diff --git a/app/assets/images/landing-background.jpg b/app/assets/images/landing-background.jpg new file mode 100644 index 000000000..8824cdb2d Binary files /dev/null and b/app/assets/images/landing-background.jpg differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 47d354a08..ec1a92641 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -292,4 +292,8 @@ table.submission-table-bordered td { direction: ltr; -webkit-font-feature-settings: 'liga'; -webkit-font-smoothing: antialiased; +} + +#main-content-row { + min-width: 100%; } \ No newline at end of file diff --git a/app/assets/stylesheets/landing.scss b/app/assets/stylesheets/landing.scss new file mode 100644 index 000000000..bbd6373b5 --- /dev/null +++ b/app/assets/stylesheets/landing.scss @@ -0,0 +1,92 @@ +@import "bootstrap/functions"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +.landing-box { + background-color: white; + max-width: 1100px; + width: 100%; + border-radius: 8px; + box-shadow: 1px 4px 7px rgba(0, 0, 0, 0.13); + + @include media-breakpoint-down(sm) { + border-radius: 0; + } +} + +#signin-box { + padding: 70px 40px; +} + +#announcement-box { + display: flex; + align-items: baseline; + margin-bottom: 20px; + padding: 15px; + background-color: rgba(255, 255, 255, 0.96); +} + +#language-switch { + position: absolute; + top: 0; + right: 0; + padding: 10px 20px; + font-size: 1.2rem; + background-color: #00243db8; + border-radius: 0 8px; + box-shadow: inset 1px 4px 5px rgba(0, 0, 0, 0.03); + + a { + color: white; + font-size: medium; + } + + @include media-breakpoint-down(sm) { + border-radius: 0; + } +} + +#landing-body { + background-image: image-url('landing-background.jpg'); + background-size: cover; +} + +.ul-no-indentation { + padding-left: 1.1rem; +} + +#mampf-logo { + width: 100px; +} + +#login-form { + margin-top: 20px; +} + +#logo-area { + color: inherit; + text-decoration: none; +} + +#github-corner-svg { + filter: drop-shadow(1px 4px 7px rgba(0, 0, 0, 0.13)); + + @include media-breakpoint-down(sm) { + opacity: 0.4; + } +} + +.remember-me-box { + white-space: nowrap; +} + +#user_remember_me { + vertical-align: top; + position: relative; + top: 6px; +} + +#remember-me-text { + white-space: normal; + display: contents; +} \ No newline at end of file diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss new file mode 100644 index 000000000..282060bcf --- /dev/null +++ b/app/assets/stylesheets/navbar.scss @@ -0,0 +1,43 @@ +.navbars-container { + background: linear-gradient(110deg, #223e62 0%, #405d75 100%); +} + +#mampfbrand { + color: white; + font-weight: bold; + filter: drop-shadow(1px 4px 7px rgba(0, 0, 0, 0.2)); +} + +#mampf-logo { + width: 35px; +} + +.navbar-nav a { + filter: drop-shadow(1px 4px 7px rgba(0, 0, 0, 0.2)); +} + +.navbar { + box-shadow: 1px 4px 7px -2px rgba(0, 0, 0, 0.1); + z-index: 1000; // place navbar and its shadow on top of everything +} + +#navbar-buttons a { + text-decoration: none; + font-size: 1.35rem; + padding: 0 9px; + color: white; + + &::after { + &.active-item { + content: "\2022"; + font-size: 1rem; + position: absolute; + top: 21px; + left: 16px; + } + } +} + +.new-comment { + color: #ffc107 !important; +} \ No newline at end of file diff --git a/app/assets/stylesheets/sidebar.scss b/app/assets/stylesheets/sidebar.scss new file mode 100644 index 000000000..9b9ccc91c --- /dev/null +++ b/app/assets/stylesheets/sidebar.scss @@ -0,0 +1,47 @@ +.sidebar-item { + margin: 3px 0; + border-radius: 10px; + padding: 0; + + a { + display: block; + color: rgb(85, 85, 85); + text-decoration: none; + padding: 8px 6px; + } + + &:hover { + border-radius: 8px; + background-color: #EBF0FE; + } +} + +#sidebar-container { + height: fit-content; + padding: 1rem 0.8rem; + background-color: white; + box-shadow: 5px 6px 9px -6px #00000054; + border-radius: 0 0 10px 0; + + .active-item { + background-color: #EBF0FE; + + a { + color: #4E6ED9; + font-weight: 500; + } + } +} + +li { + display: flex; + align-items: center; + + i { + padding: 0.25rem; + } +} + +.nav-link.disabled a { + color: #cacaca; +} \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 432c32052..c88cfef2e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -283,4 +283,36 @@ def first_course_independent? .natural_sort_by(&:title) &.first&.term_independent end + + def get_announcements + return Announcement.active_on_main.pluck(:details).join + end + + # Navbar items styling based on which page we are on + # https://gist.github.com/mynameispj/5692162 + $active_css_class = "active-item" + + def get_class_for_project(project) + return request.params['project'] == project ? $active_css_class : '' + end + + def get_class_for_path(path) + return request.path == path ? $active_css_class : '' + end + + def get_class_for_path_startswith(path) + return request.path.starts_with?(path) ? $active_css_class : '' + end + + def get_class_for_any_path(paths) + return paths.include?(request.path) ? $active_css_class : '' + end + + def get_class_for_any_path_startswith(paths) + if paths.any? { |path| request.path.starts_with?(path) } + return $active_css_class + end + return '' + end + end diff --git a/app/models/announcement.rb b/app/models/announcement.rb index 74ea23326..43d7bc56e 100644 --- a/app/models/announcement.rb +++ b/app/models/announcement.rb @@ -8,6 +8,8 @@ class Announcement < ApplicationRecord paginates_per 10 + scope :active_on_main, -> { where(on_main_page: true, lecture:nil) } + # does there (still) exist a notification for the announcement for # the given user def active?(user) diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index e1035f14e..92704e649 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -14,7 +14,7 @@
- <%= f.submit t('.resend_confirmation_instructions',
+ <%= f.submit t('.resend',
default: 'Resend confirmation instructions'),
class: 'btn btn-primary' %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index b007a5b44..8da75eb5b 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -19,7 +19,7 @@
<%= f.label :password_confirmation, t('.password_confirm') %>
<%= f.password_field :password_confirmation, class: 'form-control' %>
-
+
<% if devise_mapping.rememberable? %>
-
<%= f.check_box :consents,
id: 'dsgvo-consent',
data: { noconsent: t('profile.no_consent') } %>
@@ -27,7 +27,7 @@
t('.consent_html',
policy: link_to(t('.policy'),
'https://www.uni-heidelberg.de/datenschutzerklaerung_web.html',
- target: :_blank)) %>
+ target: :_blank)), class: "d-inline", for: "dsgvo-consent" %>
<%= f.hidden_field :locale, value: I18n.locale %>
<% if ENV['USE_CAPTCHA_SERVICE']%>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 98192e48a..e8381fc1a 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -17,11 +17,9 @@
- <%= f.label :remember_me, class: 'form-check-label' do %>
- <%= f.check_box :remember_me, class: 'form-check-input' %>
- <%= t('.remember') %>
- <% end %>
+
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me, t('.remember'), id: 'remember-me-text' %>
<% end %>
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index c59315b42..ac3c0b8a2 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -13,6 +13,7 @@
href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.12.0/css/all.min.css"
integrity="sha256-ybRkN9dBjhcS2qrW1z+hfCxq+1aBdwyQM5wlQoQVt/0="
crossorigin="anonymous">
+
<%= javascript_include_tag 'application',
'data-turbolinks-track': 'reload' %>