Deploy prior to Final presentation (#281)

* First working version * Work done * Closes #185 * Track all changes * converting search results to geojson Co-authored-by: Benjamin Frost <[email protected]> * adds markers for search results Co-authored-by: Benjamin Frost <[email protected]> * added HPI geocoder * added reverse geolocation * doesnt show students for not logged in users as search results * Map 19/navigation start (#188) * implements navigation route, that takes two points and starts navigation. * navigation route uses the current position as starting point * adds test * linting * changed "context" in test * refactor: auto format scss * fix: detail and search page list height * test: add to_string tests * feat: add course search * fix: add informations to people factory * test: add and refactor search tests * run cucumber tests workflow on push (#246) * persist query * use local storage * empty * fix test * add test * add option for hamburger menu * add id * Fix routing popup showing when room popup is opened * First test for room popup * refactors first test for room popup * fix first test for room popup * fix room tests * fix room tests * made case sensitive tests * wip * fix room tests * wip * case insensitve search (maybe) ^^ * wip * case insensitive ? * rubocop friendly * refactoring, bugfixes and adding normal geocoding * fit map bounds to markers Co-authored-by: Laura Meister <[email protected]> * fit map bounds to search result markers * fix selection of one room * Update features/scenarios/search/show_search_results.feature Co-authored-by: Cedric Lorenz <[email protected]> * 111-related-matches (#247) * Return related searchable records * Sort more results Make related results less prioritized * Fix and refactor tests * Add tests and fix sorting * Use to_s instead of to_string * Update app/controllers/search_controller.rb Co-authored-by: elenagensch <[email protected]> * Update app/controllers/search_controller.rb Co-authored-by: elenagensch <[email protected]> * Update app/controllers/search_controller.rb Co-authored-by: elenagensch <[email protected]> * Update app/controllers/search_controller.rb Co-authored-by: elenagensch <[email protected]> * Update features/scenarios/search/search_for_related.feature Co-authored-by: elenagensch <[email protected]> * Correct keyword in cucumber test * Change comment in search controller * Adjust comment again * Linting issues * Make tests green * Refactor feature tests * Format code and change .rubocop.yml * Fix tests and tag priority sorting * Update searchable_record.rb * Fix tests from merge Co-authored-by: sm1lla <[email protected]> Co-authored-by: Smilla Fox <[email protected]> Co-authored-by: elenagensch <[email protected]> * updates people model and changes prohibited keys to person view * updates migration * fix people show * fix people search test * update db * debug deployment * Redesign search page * fix search tests * removed token comment * Center the search vertically * inital webmanifest * rename variable and switch from layergroup to layer * correct indentation * start implementing Ajax approach * try to send remote call * fix search index * fix empty string bug * add new feature * add feature test for search result display * format js * Set force_ssl=true (#268) (#269) Co-authored-by: NikkelM <[email protected]> Co-authored-by: Nick Bessin <[email protected]> Co-authored-by: NikkelM <[email protected]> * fix missing import * fix bottombar options redirect * implement redirects in options page * implement pure ajax and change to only html for form * adopt search results partial to master state * 211-update chair ui (#254) * update chair ui * implemented requested changes * make placeholder chair image square Co-authored-by: Margarete <[email protected]> * create detail page for courses (#255) Co-authored-by: Margarete <[email protected]> * feat: added css for circular pictures * poi ui without tests * write tests for poi detail page * refactor: rubocop corrections * fix: variable assignment * implement redirects in not signed in options page * adds options page to navbar * changes options icon in navbar * add suggestion when there are no search results (#263) * add suggestion when there are no search results * do not show suggestions on first visit * update lockfiles * adopt new changes to search results on master * fix tests and start to adopt for map search * Closes 275 * fix: test poi name * add live search on map * add map marker refresh * make similar results only dependent on more results * fix: linting issues * Switch search bar positon on focus * fix: course picture * Fix zoom on 'Show on map' click * Fix popup not removing * fix linter issues * adopt search result structure of dev * add error message and make nice * Interface to select floor (#232) *added title and red box * multiple floor interfaces * fix(map): no overlaping layers when no room selected * Start working on search page * added loading search page according to entered query * Fix merge issues * 200 navigation button (#265) * add navigation route to button * navigate to center of mass when clicking navigate button in detail view * use other navigation button, fix tests * delete puts and fix redeclaration of variable * rename css class, fix failures on dev * change icon of navigation button * Removed force_ssl which was part of a fix for #249 but lead to the login not working anymore * delete unnessary files * fix indoor map being built before outdoor map Co-authored-by: Marie Fischer <[email protected]> Co-authored-by: Judith <[email protected]> Co-authored-by: NikkelM <[email protected]> Co-authored-by: Paul Sieben <[email protected]> Co-authored-by: tfiedlerdev <[email protected]> Co-authored-by: LeonHermann322 <[email protected]> Co-authored-by: Benjamin Frost <[email protected]> Co-authored-by: Tobias Sträubig <[email protected]> Co-authored-by: treyfel <[email protected]> Co-authored-by: rothaarlappen <[email protected]> Co-authored-by: Lukas Wenner <[email protected]> Co-authored-by: cdfhalle <[email protected]> Co-authored-by: elenagensch <[email protected]> Co-authored-by: Benjamin Frost <[email protected]> Co-authored-by: Tom Richter <[email protected]> Co-authored-by: MartinPreiss <[email protected]> Co-authored-by: Leon Hermann <[email protected]> Co-authored-by: DevSchmidtchen <[email protected]> Co-authored-by: Laura Meister <[email protected]> Co-authored-by: MartinPreiss <[email protected]> Co-authored-by: Cedric Lorenz <[email protected]> Co-authored-by: Abdullatif Ghajar <[email protected]> Co-authored-by: sm1lla <[email protected]> Co-authored-by: Smilla Fox <[email protected]> Co-authored-by: Kirill Postnov <[email protected]> Co-authored-by: Tobias Sträubig <[email protected]> Co-authored-by: Paul Sieben <[email protected]> Co-authored-by: Lucas Liebe <[email protected]> Co-authored-by: Franz Sauerwald <[email protected]> Co-authored-by: Nick Bessin <[email protected]> Co-authored-by: lucasliebe <[email protected]> Co-authored-by: richardschiemenz <[email protected]> Co-authored-by: Margarete <[email protected]> Co-authored-by: cdfhalle <[email protected]> Co-authored-by: Nikola Genchev <[email protected]> Co-authored-by: Kirill <[email protected]> Co-authored-by: 23mafi <[email protected]> Co-authored-by: Marie Fischer <[email protected]> Co-authored-by: Judith <[email protected]> Co-authored-by: Margarete01 <[email protected]>
hpi-swt2 · Feb 17, 2022 · 16f755a · 16f755a
1 parent 3bfcd14
commit 16f755a
Show file tree

Hide file tree

Showing 109 changed files with 2,102 additions and 21,932 deletions.
diff --git a/.github/workflows/run_acceptance_tests.yml b/.github/workflows/run_acceptance_tests.yml
@@ -1,12 +1,13 @@
 name: Acceptance tests
 
 on:
+  push:
   # Allow manual triggering
   workflow_dispatch:
 
 jobs:
   # Name of the job
-  rspec-test:
+  cucumber-test:
     runs-on: ubuntu-latest
 
     # https://docs.github.com/en/actions/using-containerized-services/creating-postgresql-service-containers

diff --git a/.gitignore b/.gitignore
@@ -90,3 +90,5 @@ er-diagram.png
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+
+.vscode
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -7,6 +7,7 @@ require:
 
 # opt-in to new rules (cops)
 AllCops:
+  TargetRubyVersion: 2.7
   NewCops: enable
 
 #
@@ -106,3 +107,8 @@ Metrics/AbcSize:
 # Okay to use has_and_belongs_to_many for many-to-many relationships
 Rails/HasAndBelongsToMany:
   Enabled: false
+
+
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: false
+
diff --git a/Gemfile b/Gemfile
@@ -46,7 +46,7 @@ gem 'omniauth' # https://github.com/omniauth/omniauth
 gem 'omniauth_openid_connect' # https://github.com/m0n9oose/omniauth_openid_connect
 
 gem 'open_uri_redirections'
-
+gem 'jquery-rails'
 #
 # Gems that are loaded depending on the environment (development/test/production)
 #
@@ -91,7 +91,7 @@ group :development do
   gem 'better_errors' # https://github.com/BetterErrors/better_errors
   # binding_of_caller is optional, but is necessary to use Better Errors' advanced features
   gem 'binding_of_caller' # https://github.com/banister/binding_of_caller
-  # Generate a diagram based on your application's Active Record models by calling 'bundle exec erd'. Dependency: graphviz
+  # Generate a diagram based on your application's models by calling 'bundle exec erd'. Dependency: graphviz
   gem 'rails-erd' # https://github.com/voormedia/rails-erd
 end
 
@@ -117,3 +117,6 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Pass variables from controller to JS
+gem 'gon'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -177,6 +177,11 @@ GEM
     ffi (1.15.5-x64-mingw32)
     globalid (1.0.0)
       activesupport (>= 5.0)
+    gon (6.4.0)
+      actionpack (>= 3.0.20)
+      i18n (>= 0.7)
+      multi_json
+      request_store (>= 1.0)
     hashie (5.0.0)
     httpclient (2.8.3)
     i18n (1.8.11)
@@ -185,6 +190,10 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.5.0)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -207,6 +216,7 @@ GEM
     mini_portile2 (2.7.1)
     minitest (5.15.0)
     msgpack (1.4.4)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     nio4r (2.5.8)
     nokogiri (1.13.1)
@@ -296,6 +306,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.2.0)
+    request_store (1.5.1)
+      rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -450,7 +462,9 @@ DEPENDENCIES
   devise-i18n
   devise-i18n-bootstrap
   factory_bot_rails
+  gon
   jbuilder (~> 2.7)
+  jquery-rails
   listen (~> 3.3)
   omniauth
   omniauth_openid_connect

diff --git a/app/assets/images/placeholder_chair.png b/app/assets/images/placeholder_chair.png
diff --git a/app/assets/images/placeholder_course.png b/app/assets/images/placeholder_course.png
diff --git a/app/assets/images/placeholder_poi.png b/app/assets/images/placeholder_poi.png
diff --git a/app/assets/stylesheets/_colors.scss b/app/assets/stylesheets/_colors.scss
@@ -1,11 +1,11 @@
-$red: #FD1015;
-$blue: #167FFB;
-$yellow: #FFC65A;
-$orange: #E67E22;
-$green: #1EDD88;
-$gray: #0E0000;
-$lightgray: #F4F4F4;
-$mediumgray: #C4C4C4;
+$red: #fd1015;
+$blue: #167ffb;
+$yellow: #ffc65a;
+$orange: #e67e22;
+$green: #1edd88;
+$gray: #0e0000;
+$lightgray: #f4f4f4;
+$mediumgray: #c4c4c4;
 
 // See 'Auszug aus dem HPI Corporate Design Manual'
 // tints / shades generator: https://maketintsandshades.com/#b0063a,e2681e,f9a61b,007a9e

diff --git a/app/assets/stylesheets/_values.scss b/app/assets/stylesheets/_values.scss
@@ -1,3 +1,3 @@
 // Navigation bars
 $navbar-height: 3.5rem;
-$titlebar-height: 3rem;
+$titlebar-height: 3rem;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -23,14 +23,14 @@ $font-size-base: 1rem;
 
 // Colors
 $body-color: $gray;
-$primary:    $hpi-red;
-$success:    $green;
-$info:       $yellow;
-$danger:     $red;
-$warning:    $orange;
+$primary: $hpi-red;
+$success: $green;
+$info: $yellow;
+$danger: $red;
+$warning: $orange;
 
 // Input radius
-$border-radius:    2px;
+$border-radius: 2px;
 $border-radius-lg: 2px;
 $border-radius-sm: 2px;
 
@@ -40,13 +40,13 @@ External libraries
 // Bootstrap
 @import "bootstrap/scss/bootstrap";
 // FontAwesome
-$fa-font-path: '@fortawesome/fontawesome-free/webfonts';
-@import '@fortawesome/fontawesome-free/scss/fontawesome';
-@import '@fortawesome/fontawesome-free/scss/solid';
-@import '@fortawesome/fontawesome-free/scss/regular';
-@import '@fortawesome/fontawesome-free/scss/brands';
-@import '@fortawesome/fontawesome-free/scss/v4-shims';
+$fa-font-path: "@fortawesome/fontawesome-free/webfonts";
+@import "@fortawesome/fontawesome-free/scss/fontawesome";
+@import "@fortawesome/fontawesome-free/scss/solid";
+@import "@fortawesome/fontawesome-free/scss/regular";
+@import "@fortawesome/fontawesome-free/scss/brands";
+@import "@fortawesome/fontawesome-free/scss/v4-shims";
 
 // CSS partials
 @import "components/navbar";
-@import "components/bottombar";
+@import "components/bottombar";
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
@@ -17,6 +17,28 @@
   background-color: $hpi-red-tint !important;
 }
 
+.picture-circle-container {
+  position: relative;
+  max-width: 12em;
+  max-height: 12em;
+
+  &::after {
+    content: "";
+    display: block;
+    padding-bottom: 100%;
+  }
+}
+
+.picture-circle {
+  background: #ddd;
+  object-fit: cover;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  aspect-ratio: 1;
+  border-radius: 50%;
+}
+
 .picture-rounded {
   max-width: 100%;
   max-height: 12em;

diff --git a/app/assets/stylesheets/components/_bottombar.scss b/app/assets/stylesheets/components/_bottombar.scss
@@ -2,24 +2,24 @@
 @import "colors";
 
 .navbar-custom-bottom {
-    position: fixed;
-    bottom: 0;
-    display: none;
-    z-index: 1000;
-    background-color: $hpi-red;
-    height: $navbar-height;
+  position: fixed;
+  bottom: 0;
+  display: none;
+  z-index: 1000;
+  background-color: $hpi-red;
+  height: $navbar-height;
 
-    .active .nav-link {
-        color: white !important;
-    }
+  .active .nav-link {
+    color: white !important;
+  }
 }
 
 @media only screen and (max-width: 400px) {
-    .navbar-custom-bottom {
-        display: block;
-    }
+  .navbar-custom-bottom {
+    display: block;
+  }
 
   .container {
     padding-bottom: $navbar-height;
   }
-}
+}
diff --git a/app/assets/stylesheets/components/_iconbutton.scss b/app/assets/stylesheets/components/_iconbutton.scss
@@ -30,4 +30,4 @@
   .iconbutton {
     margin-right: 0;
   }
-}
+}
diff --git a/app/assets/stylesheets/components/_map_navigation_popup.scss b/app/assets/stylesheets/components/_map_navigation_popup.scss
@@ -1,4 +1,4 @@
 #routing-controller {
-    width: 100%;
-    padding: 5px;
-}
+  width: 100%;
+  padding: 5px;
+}
diff --git a/app/assets/stylesheets/components/_map_popup.scss b/app/assets/stylesheets/components/_map_popup.scss
diff --git a/app/assets/stylesheets/components/_room_popup.scss b/app/assets/stylesheets/components/_room_popup.scss
@@ -0,0 +1,17 @@
+.room-popup {
+  width: 90%;
+  position: fixed !important;
+  bottom: 2rem;
+  left: 5%;
+  z-index: 9999;
+}
+
+@media only screen and (max-width: 400px) {
+  .room-popup {
+    bottom: 5rem;
+
+    .iconbuttons {
+      justify-content: space-between !important;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/components/_titlebar.scss b/app/assets/stylesheets/components/_titlebar.scss
@@ -2,16 +2,16 @@
 @import "colors";
 
 .titlebar {
-    position: fixed;
-    top: 0;
-    display: none !important;
-    z-index: 1000;
-    background-color: $hpi-red;
-    height: $titlebar-height;
+  position: fixed;
+  top: 0;
+  display: none !important;
+  z-index: 1000;
+  background-color: $hpi-red;
+  height: $titlebar-height;
 }
 
 @media only screen and (max-width: 400px) {
-    .titlebar {
-        display: block !important;
-    }
-}
+  .titlebar {
+    display: block !important;
+  }
+}
diff --git a/app/assets/stylesheets/data_problems.scss b/app/assets/stylesheets/data_problems.scss
@@ -3,9 +3,9 @@
 // You can use Sass (SCSS) here: https://sass-lang.com/
 
 .buttons {
-    float: right;
-    
-    a {
-        text-decoration: none;
-    }
+  float: right;
+
+  a {
+    text-decoration: none;
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,4 @@ @@
       .iconbutton {
         margin-right: 0;
       }
-    }
+    }