Skip to content
Snippets Groups Projects

Cleanup

Merged Helene Yuee Jonson requested to merge cleanup into develop
1 unresolved thread

Merge request reports

Pipeline #136258 failed

Pipeline failed for 950acf13 on cleanup

Approved by

Merged by Tore BergebakkenTore Bergebakken 3 years ago (May 10, 2021 10:39am UTC)

Merge details

  • Changes merged into develop with 4c07b6d3.
  • Deleted the source branch.

Pipeline #136259 passed

Pipeline passed for 4c07b6d3 on develop

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
6 6 import { formatDate } from "../../utils/date";
7 7 import { useTranslation } from "react-i18next";
8 8
9 /**
10 * Returns a card that displays the registered data for the content registered.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 3 3 import { StyleSheet, View } from "react-native";
    4 4 import { ArrowDownIcon, ArrowUpIcon } from "../basicComponents/Icons";
    5 5
    6 /**
    7 * Function that creates a clickable card that displays a name and an arrow to show if it is clicked.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 13 13 import { calcOrUseDistance } from "../../utils/distance";
    14 14 const placeholder = require("../../assets/images/placeholder-wide.png");
    15 15
    16 /**
    17 * Returns a card that displays the dumpster in listView.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 10 10 import InfoRow from "../dumpsterInfo/InfoRow";
    11 11 import ExtraInfo from "../dumpsterInfo/ExtraInfo";
    12 12
    13 /**
    14 * Return a dropdown card that will show the data for a dumpster revision when it is clicked.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 6 6 import Photo from "../../models/Photo";
    7 7 const placeholder = require("../../assets/images/placeholder.png");
    8 8
    9 /**
    10 * Returns a component with a photo and two buttons to move to the next/last photo.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 17 17 import { AirbnbRating } from "react-native-ratings";
    18 18 import { useState } from "react";
    19 19
    20 /**
    21 * Return modal that lets user enter information about an item they found and add it to the app.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 21 21 import { useTranslation } from "react-i18next";
    22 22 import { AirbnbRating } from "react-native-ratings";
    23 23
    24 /**
    25 * Returns modal that lets user edit the registered content if they have taken some or it is gone.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 4 4 import { CameraButtonIcon, EditButtonIcon } from "../basicComponents/Icons";
    5 5 import { useTranslation } from "react-i18next";
    6 6
    7 /**
    8 * Returns modal that lets users decide if they want to add an item or add a photo of the contents.
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 7 7 } from "@ui-kitten/components";
    8 8 import { useTranslation } from "react-i18next";
    9 9
    10 //TODO Should we delete?
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 7 7 import { languageSelector, setLanguage } from "../../redux/slices/configSlice";
    8 8 import { useAppDispatch } from "../../redux/store";
    9 9
    10 /**
    11 * Ratio buttons with different languages as values
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 3 3 import { StyleSheet, View } from "react-native";
    4 4 import { useTranslation } from "react-i18next";
    5 5
    6 /**
    7 * Returns a view with advice for dumpster divers
  • Tore Bergebakken
    Tore Bergebakken @toberge started a thread on commit 7998c774
  • 10 10 } from "../basicComponents/Icons";
    11 11 import { useTranslation } from "react-i18next";
    12 12
    13 /**
    14 * Returns view with an explanation of icons used in the app
  • Helene Yuee Jonson requested review from @toberge and removed review request for @heleneyj

    requested review from @toberge and removed review request for @heleneyj

  • 1 {
  • added 1 commit

    Compare with previous version

  • Tore Bergebakken approved this merge request

    approved this merge request

  • mentioned in commit 4c07b6d3

  • Please register or sign in to reply
    Loading