Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/routes/account.settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ export default function Settings() {
<hr className="my-2 h-px border-0 bg-[#dcdada] dark:bg-gray-700" />
<div className="">
<p>
If you delete your account, all your senseBoxes and
If you delete your account, all your devices and
measurements will be deleted.
</p>
<p className="mb-0 mt-1">
Expand Down
2 changes: 1 addition & 1 deletion app/routes/api.boxes.$deviceId.data.$sensorId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { StandardResponse } from '~/utils/response-utils'
* required: true
* schema:
* type: string
* description: the ID of the senseBox you are referring to
* description: the ID of the device you are referring to
* - in: path
* name: sensorId
* required: true
Expand Down
6 changes: 3 additions & 3 deletions app/routes/api.boxes.$deviceId.locations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { StandardResponse } from "~/utils/response-utils";
* get:
* tags:
* - Boxes
* summary: Get locations of a senseBox
* description: Get all locations of the specified senseBox ordered by date as an array of GeoJSON Points.
* summary: Get locations of a device
* description: Get all locations of the specified device ordered by date as an array of GeoJSON Points.
* If `format=geojson`, a GeoJSON linestring will be returned, with `properties.timestamps`
* being an array with the timestamp for each coordinate.
* parameters:
Expand All @@ -19,7 +19,7 @@ import { StandardResponse } from "~/utils/response-utils";
* required: true
* schema:
* type: string
* description: the ID of the senseBox you are referring to
* description: the ID of the device you are referring to
* - in: query
* name: from-date
* required: false
Expand Down
4 changes: 2 additions & 2 deletions app/routes/api.boxes.$deviceId.sensors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import { StandardResponse } from '~/utils/response-utils'
* get:
* tags:
* - Sensors
* summary: Get the latest measurements of all sensors of the specified senseBox.
* summary: Get the latest measurements of all sensors of the specified device.
* parameters:
* - in: path
* name: deviceId
* required: true
* schema:
* type: string
* description: the ID of the senseBox you are referring to
* description: the ID of the device you are referring to
* - in: query
* name: count
* required: false
Expand Down
4 changes: 2 additions & 2 deletions app/routes/device.$deviceId.dataupload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ export default function DataUpload({ actionData }: any) {
<div className="mb-8 rounded-md bg-muted p-4 text-muted-foreground">
<p>
<Trans t={t} i18nKey="dataUploadExplanation">
Here you can upload measurements for this senseBox. This
can be of use for senseBoxes that log their measurements
Here you can upload measurements for this device. This
can be of use for devices that log their measurements
to an SD card when no means of direct communication to
openSenseMap are available. Either select a file, or copy
the data into the text field. Accepted data formats are
Expand Down
4 changes: 2 additions & 2 deletions app/routes/device.$deviceId.edit.general.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ export default function () {
{/* Delete device */}
<div>
<h1 className="mt-7 text-3xl text-[#FF4136]">
Delete senseBox
Delete device
</h1>
</div>

Expand Down Expand Up @@ -593,7 +593,7 @@ export default function () {
disabled={!passwordDelVal}
className="mb-5 rounded border border-gray-200 px-4 py-2 text-black hover:bg-[#e6e6e6] disabled:border-[#ccc] disabled:text-[#8a8989]"
>
Delete senseBox
Delete device
</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/routes/device.$deviceId.edit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default function EditBox() {
<ToastPrimitive.Title className=" flex justify-between text-base font-medium text-[#31708f] dark:text-gray-100">
{/* Account successfully deleted. */}
<div>
senseBox succesfully updated -
device succesfully updated -
<Link to={`/explore/${deviceId}`}>
{" "}
<span className="text-[#4eaf47] hover:underline">
Expand Down
12 changes: 6 additions & 6 deletions app/routes/device.$deviceId.overview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function action() {
}

//**********************************
export default function DeviceOnverview() {
export default function DeviceOverview() {
const { deviceData, sensorsData } = useLoaderData<typeof loader>();

return (
Expand All @@ -45,18 +45,18 @@ export default function DeviceOnverview() {
<div className="space-y-0.5">
<h2 className="text-3xl font-bold tracking-normal ">Device Overview</h2>
<p className="text-muted-foreground">
View sensebox details and sensors.
View device details and sensors.
</p>
</div>
<Separator />

<h2 className="text-2xl font-bold tracking-normal ">senseBox</h2>
<h2 className="text-2xl font-bold tracking-normal ">Device</h2>
{/* sensebox table */}
<Table>
<TableBody className="border-[1px]">
<TableRow>
<TableCell className=" w-[50%] border-r-[1px]">
senseBox Name
Device Name
</TableCell>
<TableCell className=" w-[50%] border-r-[1px] font-semibold">
{deviceData?.name}
Expand All @@ -65,7 +65,7 @@ export default function DeviceOnverview() {

<TableRow>
<TableCell className=" w-[50%] border-r-[1px]">
senseBox Model
Device Model
</TableCell>
<TableCell className=" w-[50%] border-r-[1px] font-semibold">
XXXX
Expand All @@ -90,7 +90,7 @@ export default function DeviceOnverview() {

<TableRow>
<TableCell className=" w-[50%] border-r-[1px]">
senseBox ID
Device ID
</TableCell>
<TableCell className=" w-[50%] border-r-[1px] font-semibold">
{deviceData?.id}
Expand Down
2 changes: 1 addition & 1 deletion app/routes/device.transfer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function DeviceTransfer() {
Device Transfer
</h2>
<p className="text-muted-foreground">
Import sensebox into your account.
Import device into your account.
</p>
</div>
<Separator />
Expand Down
2 changes: 1 addition & 1 deletion app/routes/explore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ export default function Explore() {
}
}

//* fly to sensebox location when url inludes deviceId
//* fly to device location when url inludes deviceId
const { deviceId } = useParams()
var deviceLoc: any
let selectedDevice: any
Expand Down
4 changes: 2 additions & 2 deletions emails/delete-user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const messages = {
heading: 'openSenseMap account has been deleted',
hello: 'Dear',
description:
'Your account and all registered senseBoxes are being deleted. Sad to see you go!',
'Your account and all registered devices are being deleted. Sad to see you go!',
hint: 'This action is irreversible. If you want to participate again, register yourself a new account at',
hint_suffix: '.',
support: 'If you have any questions, feel free to write us an email to:',
Expand All @@ -27,7 +27,7 @@ const messages = {
heading: 'openSenseMap Account wurde gelöschen',
hello: 'Hallo',
description:
'Dein Account und alle deine senseBoxen wurden gerade gelöscht. Schade, dass du dich gelöscht hast!',
'Dein Account und alle deine Geräte wurden gerade gelöscht. Schade, dass du dich gelöscht hast!',
hint: 'Dieser Vorgang ist endgültig. Wenn du gerne wieder teilnehmen möchtest, kannst du dich einfach auf',
hint_suffix: 'neu registrieren.',
support: 'Wenn Du Fragen hast schreib uns eine Mail an:',
Expand Down
4 changes: 2 additions & 2 deletions emails/new-device-hackair.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const messages = {
'Thank you for registering your hackAIR home v2 particulate matter sensor {deviceName} on openSenseMap!',
hint: "🎉 Now, you have to configure your device in order to submit measurements to the openSenseMap. You'll find instructions to do so on",
thanks: 'Thank you very much for contributing!',
deviceId: 'Your senseBox ID is:',
deviceId: 'Your device ID is:',
opensensemapHint: 'You can view your device at this location:',
support: 'If you have any questions, feel free to write us an email to:',
salutation: 'The openSenseMap team wishes you a lot of fun',
Expand All @@ -32,7 +32,7 @@ const messages = {
'vielen Dank für die Registrierung deines hackAIR home v2 Feinstaubsensors {deviceName} auf der openSenseMap!',
hint: '🎉 Damit deine Daten auch die openSenseMap erreichen, musst du noch deinen Feinstaubsensor konfigurieren. Eine Anleitung findest du unter',
thanks: 'Vielen lieben Dank, dass du dich am Projekt beteiligst.',
deviceId: 'Deine senseBox-ID lautet:',
deviceId: 'Deine Gerät-ID lautet:',
opensensemapHint:
'Du findest deine Station auf der openSenseMap unter dieser Adresse:',
support: 'Wenn Du Fragen hast schreib uns eine Mail an:',
Expand Down
2 changes: 1 addition & 1 deletion emails/new-user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const messages = {
description:
"thank you for registering yourself on the openSenseMap platform. You'll find your profile at",
descriptionSuffix:
'There, you can create new senseBoxes and change data and credentials.',
'There, you can create new devices and change data and credentials.',
confirm: 'Please confirm your email address. Just click on this',
hint: 'If you are unable to click the link, you can also open this address with your web browser:',
support:
Expand Down
Loading