fix: rebase cleanup

fix: rebase cleanup fix: rebase cleanup
2026-01-21 17:12:43 +00:00 · 2023-05-24 14:53:10 +02:00
parent 0a76427ba8
commit d6d4f6e5c4
40 changed files with 4964 additions and 4493 deletions
--- a/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
+++ b/frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
@@ -13,17 +13,6 @@
  ~ this program. If not, see <https://www.gnu.org/licenses/>.
  -->

-<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item-host-default.html
-<h2>
-  {{ 'name' | thingTranslate: item }}
-</h2>
-<p *ngIf="item.description">
-  <stapps-long-inline-text
-    [text]="'description' | thingTranslate: item"
-    [size]="80"
-  ></stapps-long-inline-text>
-</p>
-========
 <stapps-section title="{{ 'dashboard.navigation.item.search' | translate }}">
  <ion-searchbar
    [routerLink]="['/search']"
@@ -33,4 +22,3 @@
    <ion-ripple-effect></ion-ripple-effect>
  </ion-searchbar>
 </stapps-section>
->>>>>>>> app/develop:frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
--- a/frontend/app/src/app/modules/data/chips/edit-event-selection.html
+++ b/frontend/app/src/app/modules/data/chips/edit-event-selection.html
@@ -24,11 +24,11 @@
  <ion-list inset="true" lines="full">
    <ion-item lines="none" (click)="modified.emit(); frequency.click()" class="list-header">
      <ion-list-header>
-        <ion-label>{{
-          frequency.children[0].item.repeatFrequency
-            ? (frequency.children[0].item.repeatFrequency | durationLocalized: true | sentencecase)
-            : ('data.chips.add_events.popover.SINGLE' | translate | titlecase)
-        }}</ion-label>
+        <ion-label
+          >{{ frequency.children[0].item.repeatFrequency ? (frequency.children[0].item.repeatFrequency |
+          durationLocalized: true | sentencecase) : ('data.chips.add_events.popover.SINGLE' | translate |
+          titlecase) }}</ion-label
+        >
        <ion-button></ion-button>
      </ion-list-header>
      <ion-checkbox slot="end" [checked]="frequency.checked" [indeterminate]="frequency.indeterminate">
@@ -41,19 +41,18 @@
      <ion-label>
        <ng-container *ngIf="date.item.dates.length > 1; else single_event">
          <ion-text>
-            {{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} -
-            {{ date.item.dates[0] | amAdd: date.item.duration | amDateFormat: 'LT' }}
+            {{ date.item.dates[0] | amDateFormat: 'dddd, LT' }} - {{ date.item.dates[0] | amAdd:
+            date.item.duration | amDateFormat: 'LT' }}
          </ion-text>
          <br />
          <ion-text>
-            {{ date.item.dates[0] | amDateFormat: 'LL' }} -
-            {{ date.item.dates[date.item.dates.length - 1] | amDateFormat: 'LL' }}
+            {{ date.item.dates[0] | amDateFormat: 'LL' }} - {{ date.item.dates[date.item.dates.length - 1] |
+            amDateFormat: 'LL' }}
          </ion-text>
        </ng-container>
        <ng-template #single_event>
          <ion-text *ngIf="date.item.dates[0] as time; else noDates">
-            {{ time | amDateFormat: 'LL, LT' }} -
-            {{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
+            {{ time | amDateFormat: 'LL, LT' }} - {{ time | amAdd: date.item.duration | amDateFormat: 'LT' }}
          </ion-text>
          <ng-template #noDates>
            <ion-text color="danger">{{ 'data.chips.add_events.popover.DATA_ERROR' | translate }}</ion-text>
--- a/frontend/app/src/app/modules/data/data-icon.config.ts
+++ b/frontend/app/src/app/modules/data/data-icon.config.ts
@@ -12,7 +12,6 @@
 *  You should have received a copy of the GNU General Public License along with
 *  this program. If not, see <https://www.gnu.org/licenses/>.
 */
-
 import {SCThingType} from '@openstapps/core';
 import {SCIcon} from '../../util/ion-icon/icon';

@@ -22,6 +21,7 @@ export const DataIcons: Record<SCThingType, string> = {
  'article': SCIcon`article`,
  'book': SCIcon`book`,
  'building': SCIcon`location_city`,
+  'certification': SCIcon`fact_check`,
  'catalog': SCIcon`inventory_2`,
  'contact point': SCIcon`contact_page`,
  'course of study': SCIcon`school`,
--- a/frontend/app/src/app/modules/data/elements/favorite-button.component.html
+++ b/frontend/app/src/app/modules/data/elements/favorite-button.component.html
@@ -13,17 +13,6 @@
  ~ this program. If not, see <https://www.gnu.org/licenses/>.
  -->

-<<<<<<<< HEAD:frontend/app/src/app/modules/dashboard/sections/search-section/search-section.component.html
-<stapps-section title="{{ 'dashboard.navigation.item.search' | translate }}">
-  <ion-searchbar
-    [routerLink]="'/search'"
-    [routerAnimation]="routeTransition"
-    class="stapps-searchbar ion-activatable ripple-parent"
-  >
-    <ion-ripple-effect></ion-ripple-effect>
-  </ion-searchbar>
-</stapps-section>
-========
 <ion-button (click)="toggle($event)" color="medium" size="small" fill="clear">
  <ion-icon
    slot="icon-only"
@@ -32,4 +21,3 @@
    name="grade"
  ></ion-icon>
 </ion-button>
->>>>>>>> app/develop:frontend/app/src/app/modules/data/elements/favorite-button.component.html
--- a/frontend/app/src/app/modules/data/elements/offers-in-list.html
+++ b/frontend/app/src/app/modules/data/elements/offers-in-list.html
@@ -15,17 +15,14 @@

 <div>
  <ion-text *ngIf="price && !soldOut" style="white-space: nowrap">
-    <h2>
-      {{ price | currency : 'EUR' : 'symbol' : undefined : 'de' }}
-    </h2>
+    <h2>{{ price | currency : 'EUR' : 'symbol' : undefined : 'de' }}</h2>
  </ion-text>
  <ion-text *ngIf="soldOut" color="danger" class="sold-out" style="white-space: nowrap">
-    <h2>
-      {{ 'data.detail.offers.sold_out' | translate }}
-    </h2>
+    <h2>{{ 'data.detail.offers.sold_out' | translate }}</h2>
  </ion-text>
  <p *ngIf="_offers[0].inPlace && !soldOut" class="place" style="white-space: nowrap">
-    <ion-icon name="pin_drop"></ion-icon>{{ _offers[0].inPlace.name
-    }}<span *ngIf="_offers.length > 1">...</span>
+    <ion-icon name="pin_drop"></ion-icon>{{ _offers[0].inPlace.name }}<span *ngIf="_offers.length > 1"
+      >...</span
+    >
  </p>
 </div>
--- a/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts
+++ b/frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts
@@ -12,20 +12,6 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-
-<<<<<<<< HEAD:frontend/app/src/app/util/simple-swiper.component.ts
-import {Component, ContentChildren, ElementRef, ViewContainerRef} from '@angular/core';
-
-@Component({
-  selector: 'simple-swiper',
-  templateUrl: 'simple-swiper.html',
-  styleUrls: ['simple-swiper.scss'],
-})
-export class SimpleSwiperComponent {
-  constructor(readonly viewContainerRef: ViewContainerRef) {}
-
-  @ContentChildren('*') children: ElementRef<unknown>;
-========
 import {Component, Input} from '@angular/core';
 import {SCThings} from '@openstapps/core';

@@ -35,5 +21,4 @@ import {SCThings} from '@openstapps/core';
 })
 export class DataListItemHostDefaultComponent {
  @Input() item: SCThings;
->>>>>>>> app/develop:frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts
 }
--- a/frontend/app/src/app/modules/data/list/search-page.html
+++ b/frontend/app/src/app/modules/data/list/search-page.html
@@ -60,9 +60,7 @@
    [class.no-results]="!showDefaultData && !items && !loading"
    [style.display]="!showDefaultData && !items && !loading ? 'block' : 'none'"
  >
-    <ion-label class="centeredMessageContainer">
-      {{ searchInstruction | translate }}
-    </ion-label>
+    <ion-label class="centeredMessageContainer"> {{ searchInstruction | translate }} </ion-label>
  </div>
  <stapps-data-list
    id="data-list"
--- a/frontend/app/src/app/modules/data/list/skeleton-list.component.ts
+++ b/frontend/app/src/app/modules/data/list/skeleton-list.component.ts
@@ -13,21 +13,11 @@
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */

-import {Component, Input} from '@angular/core';
-import {SCThings} from '@openstapps/core';
+import {Component} from '@angular/core';

@Component({
-<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list-item-host-default.component.ts
-  selector: 'data-list-item-host-default',
-  templateUrl: 'data-list-item-host-default.html',
-})
-export class DataListItemHostDefaultComponent {
-  @Input() item: SCThings;
-}
-========
  selector: 'skeleton-list',
  templateUrl: 'skeleton-list.html',
  styleUrls: ['skeleton-list.scss'],
 })
 export class SkeletonListComponent {}
->>>>>>>> app/develop:frontend/app/src/app/modules/data/list/skeleton-list.component.ts
--- a/frontend/app/src/app/modules/data/types/dish/dish-characteristics.html
+++ b/frontend/app/src/app/modules/data/types/dish/dish-characteristics.html
@@ -22,7 +22,5 @@
      ></abbr>
    </ng-container>
  </ng-container>
-  <ion-label>
-    {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }}
-  </ion-label>
+  <ion-label> {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }} </ion-label>
 </ion-note>
--- a/frontend/app/src/app/modules/data/types/dish/dish-list-item.html
+++ b/frontend/app/src/app/modules/data/types/dish/dish-list-item.html
@@ -18,9 +18,7 @@
    <ion-col size="11" size-sm="10">
      <div class="ion-text-wrap">
        <ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
-        <p class="title-sub ion-hide-sm-down">
-          {{ 'description' | thingTranslate: item }}
-        </p>
+        <p class="title-sub ion-hide-sm-down">{{ 'description' | thingTranslate: item }}</p>
        <stapps-dish-characteristics [item]="item"></stapps-dish-characteristics>
      </div>
    </ion-col>
--- a/frontend/app/src/app/modules/data/types/event/event-list-item.html
+++ b/frontend/app/src/app/modules/data/types/event/event-list-item.html
@@ -18,9 +18,7 @@
    <ion-col>
      <div class="ion-text-wrap">
        <ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
-        <p *ngIf="item.description" class="title-sub">
-          {{ 'description' | thingTranslate: item }}
-        </p>
+        <p *ngIf="item.description" class="title-sub">{{ 'description' | thingTranslate: item }}</p>
        <p *ngIf="item.academicTerms" class="title-sub">
          {{ 'name' | thingTranslate: item.academicTerms[0] }}
        </p>
@@ -34,12 +32,8 @@
  <ion-row *ngIf="item.type === 'sport course'">
    <ion-col>
      <ion-label class="title">{{ 'name' | thingTranslate: item }}</ion-label>
-      <p *ngIf="item.description" class="title-sub">
-        {{ 'description' | thingTranslate: item }}
-      </p>
-      <p *ngIf="item.academicTerms" class="title-sub">
-        {{ 'name' | thingTranslate: item.academicTerms[0] }}
-      </p>
+      <p *ngIf="item.description" class="title-sub">{{ 'description' | thingTranslate: item }}</p>
+      <p *ngIf="item.academicTerms" class="title-sub">{{ 'name' | thingTranslate: item.academicTerms[0] }}</p>
      <ion-note>{{ 'type' | thingTranslate: item }}</ion-note>
    </ion-col>
  </ion-row>
--- a/frontend/app/src/app/modules/data/types/place/place-detail-content.html
+++ b/frontend/app/src/app/modules/data/types/place/place-detail-content.html
@@ -31,9 +31,7 @@
 </ng-container>
 <ng-container *ngIf="item.type !== 'building'">
  <ion-card *ngIf="item.inPlace">
-    <ion-card-header>
-      {{ 'inPlace' | propertyNameTranslate: item | titlecase }}
-    </ion-card-header>
+    <ion-card-header> {{ 'inPlace' | propertyNameTranslate: item | titlecase }} </ion-card-header>
    <ion-card-content>
      <stapps-data-list-item [item]="item.inPlace"></stapps-data-list-item>
    </ion-card-content>
--- a/frontend/app/src/app/modules/data/types/place/place-list-item.html
+++ b/frontend/app/src/app/modules/data/types/place/place-list-item.html
@@ -26,9 +26,7 @@
          </p>
          <p>
            <ion-note *ngIf="item.categories && item.type !== 'building'; else onlyType">
-              <ion-label>
-                {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }}
-              </ion-label>
+              <ion-label> {{ 'categories' | thingTranslate: item | join: ', ' | titlecase }} </ion-label>
              <ion-label *ngIf="distance" class="distance">
                <ion-icon name="directions_walk"></ion-icon>
                {{ distance | metersLocalized }}
@@ -37,9 +35,7 @@
          </p>
          <ng-template #onlyType>
            <ion-note>
-              <ion-label>
-                {{ 'type' | thingTranslate: item | titlecase }}
-              </ion-label>
+              <ion-label> {{ 'type' | thingTranslate: item | titlecase }} </ion-label>
              <ion-label *ngIf="distance" class="distance">
                <ion-icon name="directions_walk"></ion-icon>
                {{ distance | metersLocalized }}
@@ -47,9 +43,7 @@
            </ion-note>
          </ng-template>
        </ng-container>
-        <p *ngIf="item.description">
-          {{ 'description' | thingTranslate: item }}
-        </p>
+        <p *ngIf="item.description">{{ 'description' | thingTranslate: item }}</p>
      </div>
    </ion-col>
    <ng-container *ngIf="item.type !== 'building'">
--- a/frontend/app/src/app/modules/feedback/feedback-page.html
+++ b/frontend/app/src/app/modules/feedback/feedback-page.html
@@ -42,12 +42,12 @@
            interface="popover"
            required="true"
          >
-            <ion-select-option value="Comment">{{
-              'feedback.form.type.values.comment' | translate
-            }}</ion-select-option>
-            <ion-select-option value="Bug">{{
-              'feedback.form.type.values.bug' | translate
-            }}</ion-select-option>
+            <ion-select-option value="Comment"
+              >{{ 'feedback.form.type.values.comment' | translate }}</ion-select-option
+            >
+            <ion-select-option value="Bug"
+              >{{ 'feedback.form.type.values.bug' | translate }}</ion-select-option
+            >
          </ion-select>
        </ion-item>
        <ion-item>
@@ -85,9 +85,9 @@
        </ion-item>
        <ion-item lines="none">
          <ion-label
-            ><a style="display: contents" [routerLink]="['/about/privacy']">{{
-              'feedback.form.termsAgree.1' | translate
-            }}</a></ion-label
+            ><a style="display: contents" [routerLink]="['/about/privacy']"
+              >{{ 'feedback.form.termsAgree.1' | translate }}</a
+            ></ion-label
          >
        </ion-item>
        <ion-item>
@@ -102,9 +102,9 @@
        <ion-card>
          <ion-card-title>
            <ion-button expand="block" fill="clear" (click)="toggleShowMetaData()">
-              <ng-container *ngIf="!showMetaData; else hide">{{
-                'feedback.form.protocolData.show' | translate
-              }}</ng-container>
+              <ng-container *ngIf="!showMetaData; else hide"
+                >{{ 'feedback.form.protocolData.show' | translate }}</ng-container
+              >
              <ng-template #hide>{{ 'feedback.form.protocolData.hide' | translate }}</ng-template>
            </ion-button>
          </ion-card-title>
--- a/frontend/app/src/app/modules/menu/context/context-menu.html
+++ b/frontend/app/src/app/modules/menu/context/context-menu.html
@@ -16,9 +16,7 @@
 <ion-menu type="overlay" menuId="context" contentId="{{ contentId }}" maxEdgeStart="0" side="end">
  <ion-toolbar color="primary" mode="ios">
    <ion-label class="ion-padding-horizontal">
-      <h1 class="ion-padding-horizontal">
-        {{ 'menu.context.title' | translate | titlecase }}
-      </h1>
+      <h1 class="ion-padding-horizontal">{{ 'menu.context.title' | translate | titlecase }}</h1>
    </ion-label>
  </ion-toolbar>
  <ion-content>
@@ -59,9 +57,7 @@
        <div>
          <ion-list-header class="h3">
            <ion-label>
-              <span *ngIf="facet.info.onlyOnType"
-                ><b>{{ facet.info.onlyOnType | titlecase }}</b> /
-              </span>
+              <span *ngIf="facet.info.onlyOnType"><b>{{ facet.info.onlyOnType | titlecase }}</b> / </span>
              {{ facet.info.field | titlecase }}
            </ion-label>
          </ion-list-header>
@@ -74,12 +70,9 @@
              "
            >
              <ion-label class="filter-item-label">
-                ({{ bucket.count }})
-                {{
-                  facet.field === 'type'
-                    ? (getTranslatedPropertyValue($any(bucket.key), 'type') | titlecase)
-                    : (getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key) | titlecase)
-                }}
+                ({{ bucket.count }}) {{ facet.field === 'type' ? (getTranslatedPropertyValue($any(bucket.key),
+                'type') | titlecase) : (getTranslatedPropertyValue(facet.onlyOnType, facet.field, bucket.key)
+                | titlecase) }}
              </ion-label>
              <ion-checkbox
                [(ngModel)]="bucket.checked"
--- a/frontend/app/src/app/modules/profile/page/profile-page.html
+++ b/frontend/app/src/app/modules/profile/page/profile-page.html
@@ -42,38 +42,24 @@
              class="main-info"
            >
              <ng-container *ngIf="user$ | async as userInfo">
-                <ion-text class="full-name">
-                  {{ userInfo?.name }}
-                </ion-text>
+                <ion-text class="full-name"> {{ userInfo?.name }} </ion-text>
                <div class="matriculation-number">
-                  <ion-label>
-                    {{ 'profile.userInfo.studentId' | translate | uppercase }}
-                  </ion-label>
-                  <ion-text>
-                    {{ userInfo?.studentId }}
-                  </ion-text>
+                  <ion-label> {{ 'profile.userInfo.studentId' | translate | uppercase }} </ion-label>
+                  <ion-text> {{ userInfo?.studentId }} </ion-text>
                </div>
                <div class="user-name">
-                  <ion-label>
-                    {{ 'profile.userInfo.username' | translate | uppercase }}
-                  </ion-label>
+                  <ion-label> {{ 'profile.userInfo.username' | translate | uppercase }} </ion-label>
                  <ion-text>{{ userInfo?.id }}</ion-text>
                </div>
                <div class="email">
-                  <ion-label>
-                    {{ 'profile.userInfo.email' | translate | uppercase }}
-                  </ion-label>
-                  <ion-text>
-                    {{ userInfo?.email }}
-                  </ion-text>
+                  <ion-label> {{ 'profile.userInfo.email' | translate | uppercase }} </ion-label>
+                  <ion-text> {{ userInfo?.email }} </ion-text>
                </div>
              </ng-container>
            </ion-col>
            <ng-template #logInPrompt>
              <ion-col size="9">
-                <ion-text class="log-in-prompt">
-                  {{ 'profile.userInfo.logInPrompt' | translate }}
-                </ion-text>
+                <ion-text class="log-in-prompt"> {{ 'profile.userInfo.logInPrompt' | translate }} </ion-text>
              </ion-col>
            </ng-template>
          </ion-row>
@@ -86,9 +72,7 @@
    [item]="section"
  ></stapps-profile-page-section>
  <section class="courses">
-    <ion-label class="section-headline">
-      {{ 'profile.titleCourses' | translate | uppercase }}
-    </ion-label>
+    <ion-label class="section-headline"> {{ 'profile.titleCourses' | translate | uppercase }} </ion-label>
    <ion-card class="courses-card">
      <ion-card-header (click)="toggleCourseCardState()">
        <span>{{ 'profile.courses.today' | translate | uppercase }}</span>
@@ -96,17 +80,13 @@
      </ion-card-header>
      <ion-card-content class="course-card" [class.show-card]="courseCardState === courseCardEnum.expanded">
        <ng-container *ngIf="myCoursesToday.length === 0">
-          <div class="no-course">
-            {{ 'profile.courses.no_courses' | translate }}
-          </div>
+          <div class="no-course">{{ 'profile.courses.no_courses' | translate }}</div>
        </ng-container>
        <ng-container *ngFor="let myCourse of myCoursesToday">
          <div class="clickable" [routerLink]="['/data-detail', myCourse.course.event.uid]">
            <div>{{ myCourse?.startTime }} - {{ myCourse?.endTime }}</div>
            <div>{{ myCourse?.course.event?.originalCategory }}</div>
-            <div [class.last]="!myCourse?.course.inPlace?.name">
-              {{ myCourse.course?.event?.name }}
-            </div>
+            <div [class.last]="!myCourse?.course.inPlace?.name">{{ myCourse.course?.event?.name }}</div>
            <div *ngIf="myCourse.course?.inPlace?.name" [class.last]="myCourse.course?.inPlace?.name">
              {{ myCourse.course?.inPlace.name }}
            </div>
--- a/frontend/app/src/app/util/simple-swiper.component.ts
+++ b/frontend/app/src/app/util/simple-swiper.component.ts
@@ -12,23 +12,6 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-
-<<<<<<<< HEAD:frontend/app/src/app/modules/data/list/data-list.scss
-cdk-virtual-scroll-viewport {
-  height: 100%;
-  width: 100%;
-}
-
-::ng-deep {
-  .cdk-virtual-scroll-content-wrapper {
-    width: 100%;
-  }
-}
-
-.virtual-scroll-expander {
-  clear: both;
-}
-========
 import {ChangeDetectionStrategy, Component} from '@angular/core';

@Component({
@@ -38,4 +21,3 @@ import {ChangeDetectionStrategy, Component} from '@angular/core';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SimpleSwiperComponent {}
->>>>>>>> app/develop:frontend/app/src/app/util/simple-swiper.component.ts