Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
🚨 Lint with new prettier version
Browse files Browse the repository at this point in the history
  • Loading branch information
AnandChowdhary committed Apr 7, 2020
1 parent 14aea5b commit 96f8cd3
Show file tree
Hide file tree
Showing 40 changed files with 732 additions and 544 deletions.
32 changes: 16 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email, or any other method with the owners of this repository before making a change.
email, or any other method with the owners of this repository before making a change.

Please note we have a code of conduct, please follow it in all your interactions with the project.

## Pull Request Process

1. When making commits, make sure you are using [Gitmoji](https://github.com/carloscuesta/gitmoji).
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
2. Ensure any install or build dependencies are removed before the end of the layer when doing a
build.
3. Update the README.md with details of changes to the interface, this includes new environment
3. Update the README.md with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
4. Increase the version numbers in any examples files and the README.md to the new version that this
4. Increase the version numbers in any examples files and the README.md to the new version that this
Pull Request would represent. We increase the patch version in every commit to ensure people
using Staart are always on the most recent version using our internal update system.
5. You may merge the Pull Request in once you have the review sign-off of Anand Chowdhary, or if you
5. You may merge the Pull Request in once you have the review sign-off of Anand Chowdhary, or if you
do not have permission to do that, you may request a reviewer to merge it for you.

## Code of Conduct
Expand All @@ -34,21 +34,21 @@ orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

### Our Responsibilities
Expand Down
18 changes: 9 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
trigger:
- master
- master
pool:
vmImage: "ubuntu-latest"
steps:
- task: NodeTool@0
inputs:
versionSpec: "12.x"
displayName: "Install Node.js"
- script: |
npm install
npm run build
displayName: "npm install and build"
- task: NodeTool@0
inputs:
versionSpec: "12.x"
displayName: "Install Node.js"
- script: |
npm install
npm run build
displayName: "npm install and build"
26 changes: 12 additions & 14 deletions prisma/migrations/20200402221641-init/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CREATE TABLE `staart`.`users` (
`updatedAt` datetime(3) NOT NULL ,
`username` varchar(191) NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`organizations` (
Expand All @@ -44,7 +44,7 @@ CREATE TABLE `staart`.`organizations` (
`updatedAt` datetime(3) NOT NULL ,
`username` varchar(191) NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`emails` (
Expand All @@ -55,7 +55,7 @@ CREATE TABLE `staart`.`emails` (
`updatedAt` datetime(3) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`access-tokens` (
Expand All @@ -69,7 +69,7 @@ CREATE TABLE `staart`.`access-tokens` (
`updatedAt` datetime(3) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`api-keys` (
Expand All @@ -85,7 +85,7 @@ CREATE TABLE `staart`.`api-keys` (
`scopes` varchar(191) ,
`updatedAt` datetime(3) NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`approved-locations` (
Expand All @@ -94,7 +94,7 @@ CREATE TABLE `staart`.`approved-locations` (
`subnet` varchar(191) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`backup-codes` (
Expand All @@ -105,7 +105,7 @@ CREATE TABLE `staart`.`backup-codes` (
`updatedAt` datetime(3) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`domains` (
Expand All @@ -117,7 +117,7 @@ CREATE TABLE `staart`.`domains` (
`updatedAt` datetime(3) NOT NULL ,
`verificationCode` varchar(191) NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`identities` (
Expand All @@ -129,7 +129,7 @@ CREATE TABLE `staart`.`identities` (
`updatedAt` datetime(3) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`memberships` (
Expand All @@ -140,7 +140,7 @@ CREATE TABLE `staart`.`memberships` (
`updatedAt` datetime(3) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`sessions` (
Expand All @@ -156,7 +156,7 @@ CREATE TABLE `staart`.`sessions` (
`userAgent` varchar(191) NOT NULL ,
`userId` int NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE TABLE `staart`.`webhooks` (
Expand All @@ -171,7 +171,7 @@ CREATE TABLE `staart`.`webhooks` (
`updatedAt` datetime(3) NOT NULL ,
`url` varchar(191) NOT NULL ,
PRIMARY KEY (`id`)
)
)
DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci

CREATE UNIQUE INDEX `users.username` ON `staart`.`users`(`username`)
Expand Down Expand Up @@ -461,5 +461,3 @@ migration ..20200402221641-init
+ @@index([organizationId], name: "organizationId")
+}
```


38 changes: 7 additions & 31 deletions prisma/migrations/20200402221641-init/steps.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,32 @@
{
"tag": "CreateEnum",
"enum": "Gender",
"values": [
"MALE",
"FEMALE",
"NONBINARY",
"UNKNOWN"
]
"values": ["MALE", "FEMALE", "NONBINARY", "UNKNOWN"]
},
{
"tag": "CreateEnum",
"enum": "NotificationEmails",
"values": [
"ACCOUNT",
"UPDATES",
"PROMOTIONS"
]
"values": ["ACCOUNT", "UPDATES", "PROMOTIONS"]
},
{
"tag": "CreateEnum",
"enum": "PrefersColorScheme",
"values": [
"NO_PREFERENCE",
"LIGHT",
"DARK"
]
"values": ["NO_PREFERENCE", "LIGHT", "DARK"]
},
{
"tag": "CreateEnum",
"enum": "PrefersReducedMotion",
"values": [
"NO_PREFERENCE",
"REDUCE"
]
"values": ["NO_PREFERENCE", "REDUCE"]
},
{
"tag": "CreateEnum",
"enum": "UserRole",
"values": [
"SUDO",
"USER"
]
"values": ["SUDO", "USER"]
},
{
"tag": "CreateEnum",
"enum": "MembershipRole",
"values": [
"OWNER",
"ADMIN",
"RESELLER",
"MEMBER"
]
"values": ["OWNER", "ADMIN", "RESELLER", "MEMBER"]
},
{
"tag": "CreateSource",
Expand Down Expand Up @@ -3412,4 +3388,4 @@
}
}
]
}
}
6 changes: 3 additions & 3 deletions src/controllers/admin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import {
Controller,
Get,
Request,
Response
Response,
} from "@staart/server";
import { authHandler } from "../../helpers/middleware";
import {
getAllOrganizationForUser,
getAllUsersForUser,
getServerLogsForUser
getServerLogsForUser,
} from "../../rest/admin";

@Controller("admin")
Expand Down Expand Up @@ -41,7 +41,7 @@ export class AdminController {
async info() {
return {
success: true,
message: "admin-info-success"
message: "admin-info-success",
};
}
}
Loading

0 comments on commit 96f8cd3

Please sign in to comment.