I should consider using git maybe

powercord-org · Mar 1, 2019 · 3bef344 · 3bef344
1 parent 3a0a85a
commit 3bef344
Show file tree

Hide file tree

Showing 56 changed files with 647 additions and 428 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,11 +1,10 @@
 {
-  "globals": {
-    "powercord": true,
-    "webpackJsonp": true
-  },
   "parserOptions": {
     "ecmaVersion": 2018,
-    "sourceType": "script"
+    "sourceType": "script",
+    "ecmaFeatures": {
+      "jsx": true
+    }
   },
   "env": {
     "node": true,
@@ -50,7 +49,6 @@
     "array-callback-return": [ "error", {
       "allowImplicit": true
     }],
-    "complexity": [ "error" ],
     "curly": [ "error", "all" ],
     "dot-location": [ "error", "property" ],
     "dot-notation": [ "error" ],
@@ -70,7 +68,6 @@
     "no-fallthrough": [ "error" ],
     "no-floating-decimal": [ "error" ],
     "no-global-assign": [ "error" ],
-    "no-invalid-this": [ "error" ],
     "no-lone-blocks": [ "error" ],
     "no-loop-func": [ "error" ],
     "no-multi-spaces": [ "error", {
@@ -89,10 +86,6 @@
     "no-redeclare": [ "error", {
       "builtinGlobals": true
     }],
-    "no-shadow": [ "error", {
-      "builtinGlobals": true,
-      "allow": [ "Plugin", "name" ]
-    }],
     "no-return-await": [ "error" ],
     "no-self-assign": [ "error", {
       "props": true
@@ -106,7 +99,6 @@
     "no-useless-concat": [ "error" ],
     "no-useless-escape": [ "error" ],
     "no-useless-return": [ "error" ],
-    "no-void": [ "error" ],
     "no-warning-comments": [ "error" ],
     "no-with": [ "error" ],
     "prefer-promise-reject-errors": ["error", {
@@ -141,7 +133,6 @@
     "eol-last": [ "error", "always" ],
     "func-call-spacing": [ "error", "never" ],
     "func-name-matching": [ "error", "always" ],
-    "func-names": [ "error", "as-needed" ],
     "indent": [ "error", 2, {
       "SwitchCase": 1
     }],
@@ -178,7 +169,6 @@
       }
     }],
     "padded-blocks": [ "error", "never" ],
-    "prefer-object-spread": [ "error" ],
     "quote-props": [ "error", "as-needed" ],
     "quotes": [ "error", "single" ],
     "semi": [ "error", "always" ],

diff --git a/README.md b/README.md
@@ -3,4 +3,4 @@ The backend for [powercord-org/powercord](https://github.com/powercord-org/power
 
 ### dev notes
 build scss to css (requires scss to be installed)<br>
-`scss scss/style.scss static/style.css --style compressed --sourcemap=none`
+`scss -w scss/style.scss:static/style.css --style compressed --sourcemap=none`
diff --git a/config.example.json b/config.example.json
@@ -1,14 +1,22 @@
 {
   "port": 80,
-  "discordID": "",
-  "discordSecret": "",
-  "discordHook": "",
-  "spotifyID": "",
-  "spotifySecret": "",
-  "githubID": "",
-  "githubSecret": "",
-  "githubOrg": "",
+  "discord": {
+    "clientID": "",
+    "clientSecret": "",
+    "hook": "Used to automatically send invite link to plugin/theme developers"
+  },
+  "spotify": {
+    "clientID": "",
+    "clientSecret": "",
+    "scopes": []
+  },
+  "github": {
+    "clientID": "",
+    "clientSecret": "",
+    "pluginsOrg": "powercord-community",
+    "scopes": []
+  },
   "admins": ["284122164582416385"],
   "domain": "http://localhost",
-  "secret": "aethcord is the betterest name :^)"
+  "secret": "tony was a dick, and stacy was a whore"
 }
diff --git a/scss/_account.scss b/scss/_account.scss
@@ -1,32 +1,80 @@
-.container .account {
+.accounts {
   display: flex;
-  align-items: center;
-  border-radius: 5px;
-  padding: 10px 20px;
-  margin: 20px 0;
-
-  img {
-    width: 50px;
-    height: 50px;
-    margin-right: 15px;
-  }
+  flex-wrap: wrap;
+  justify-content: space-between;
 
-  .info {
-    flex: 1;
+  &-header {
+    margin-top: 0;
   }
 
-  &.spotify {
-    background-color: #1DB954;
-    box-shadow: 0 2px 7px #15853c;
-  }
+  .account {
+    display: flex;
+    align-items: center;
+    border-radius: 5px;
+    padding: 10px 20px;
+    margin: 15px 0;
+    width: 100%;
+
+    + .account {
+      width: 49%;
+    }
+
+    img {
+      width: 50px;
+      height: 50px;
+      margin-right: 15px;
+    }
+
+    .info {
+      flex: 1;
+      display: flex;
+    }
+
+    .unlinked {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+
+      .info a {
+        margin-left: auto;
+      }
 
-  &.github {
-    background-color: #292d32;
-    box-shadow: 0 2px 7px #101213;
+      > span {
+        margin-top: 5px;
+        font-size: 14px;
+        opacity: .8;
+      }
+    }
+
+    &.spotify {
+      background-color: #1DB954;
+      box-shadow: 0 2px 7px #15853c;
+    }
+
+    &.github {
+      background-color: #292d32;
+      box-shadow: 0 2px 7px #101213;
+    }
+
+    &.discord {
+      background-color: #576aa5;
+      box-shadow: 0 2px 7px #465686;
+    }
+
+    + h2 {
+      margin-top: 50px;
+    }
   }
+}
+
+.account-badges {
+  display: flex;
+  padding: 0;
+  justify-content: space-between;
+  flex-wrap: wrap;
 
-  &.discord {
-    background-color: #576aa5;
-    box-shadow: 0 2px 7px #465686;
+  .input-field {
+    padding-top: 0;
+    width: 49%;
   }
 }
diff --git a/scss/cookieConsent.scss → scss/_cookieConsent.scss b/scss/cookieConsent.scss → scss/_cookieConsent.scss
diff --git a/scss/_features.scss b/scss/_features.scss
@@ -13,7 +13,7 @@
 
     .name {
       text-align: center;
-      font-family: 'Uni Sans', sans-serif;
+      font-family: 'Discord', sans-serif;
       font-size: 22px;
     }
 

diff --git a/scss/_form.scss b/scss/_form.scss
@@ -29,7 +29,6 @@ form {
     outline: none;
     padding: 10px;
     border-radius: 5px;
-    box-shadow: 0 2px 7px $primaryDarkest;
     font-family: 'Lato', sans-serif;
     font-size: 16px;
 
@@ -55,7 +54,7 @@ form {
   margin: 15px 0;
 
   &.create {
-    background-color: #1abc9c;
+    background-color: #1ec94a;
   }
 
   &.delete {

diff --git a/scss/_global.scss b/scss/_global.scss
@@ -1,6 +1,6 @@
 @font-face {
-  font-family: "Uni Sans";
-  src: url("/assets/unisanscaps.otf")
+  font-family: "Discord";
+  src: url("/assets/Discord.otf")
 }
 
 * {
@@ -25,7 +25,7 @@ body {
 }
 
 h1, h2, h3, h4 {
-  font-family: 'Uni Sans', sans-serif;
+  font-family: 'Discord', sans-serif;
   font-size: 32px;
 }
 

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
@@ -11,7 +11,7 @@
     align-items: center;
 
     h1 {
-      font-family: 'Uni Sans', sans-serif;
+      font-family: 'Discord', sans-serif;
       font-size: 26px;
       margin: 1px 0 0;
       display: none;

diff --git a/scss/dashboard/_plugin.scss b/scss/dashboard/_plugin.scss
@@ -6,18 +6,30 @@
 }
 
 .plugin {
-  width: 23%;
+  padding: 10px;
+  width: 100%;
+  border-radius: 5px;
   background-color: $primaryDark;
-  box-shadow: 0 2px 7px $primaryDarker;
-  padding: 10px 15px;
+  border: 1px $primaryDarker solid;
+
+  h2 {
+    margin-top: 0;
+  }
+
+  h3 {
+    font-size: 18px;
+    margin-top: 15px;
+    margin-bottom: 10px;
+    border-bottom: 1px #fff solid;
+  }
 
   .header {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
 
     .name {
-      font-family: 'Uni Sans', sans-serif;
+      font-family: 'Discord', sans-serif;
       font-size: 18px;
     }
 
@@ -32,8 +44,6 @@
   }
 
   .info {
-    padding: 20px 0;
-
     .element {
       display: flex;
       align-items: center;
@@ -51,8 +61,60 @@
     }
   }
 
-  .actions .btn {
-    margin: 0 5px 0 0;
-    padding: 5px 10px;
+  .developer {
+    display: flex;
+    align-items: center;
+
+    img {
+      border-radius: 50%;
+      width: 45px;
+      height: 45px;
+      margin-right: 10px;
+    }
+
+    .id, .name span {
+      opacity: .6;
+      font-size: 12px;
+    }
+
+    + .developer {
+      margin-top: 10px;
+    }
+  }
+
+  .actions {
+    display: flex;
+    flex-direction: column;
+
+    .btn {
+      margin: 0 0 5px;
+      width: auto;
+    }
+  }
+
+  form {
+    padding: 0;
+
+    .input-field {
+      padding-top: 0;
+
+      + .input-field {
+        padding-bottom: 5px;
+      }
+    }
+
+    label {
+      margin-bottom: 3px;
+    }
+
+    input:not([type="checkbox"]) {
+      padding: 5px 10px;
+      height: 32px;
+      width: 100%;
+    }
+
+    .btn {
+      margin-bottom: 0;
+    }
   }
 }