Merge pull request #30 from eightants/eightants-patch-1

Adding lint and prettier actions

Author: eightants

main.yml .github/workflows/prettier.ymlmain.yml renamed to .github/workflows/prettier.yml

@@ -1,12 +1,10 @@
 # This is a basic workflow to help you get started with Actions
 
-name: CI
+name: Run Prettier
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
 on:
-  push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
@@ -21,11 +19,12 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-
-      - name: Lint Action
-        uses: wearerequired/lint-action@v1.6.0
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 0
 
       - name: Prettier Action
         uses: creyD/prettier_action@v3.1
-
-
+        with:
+          only_changed: True
+          same_commit: True

application/karma.conf.js

@@ -3,30 +3,30 @@
 
 module.exports = function (config) {
   config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    basePath: "",
+    frameworks: ["jasmine", "@angular-devkit/build-angular"],
     plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage-istanbul-reporter'),
-      require('@angular-devkit/build-angular/plugins/karma')
+      require("karma-jasmine"),
+      require("karma-chrome-launcher"),
+      require("karma-jasmine-html-reporter"),
+      require("karma-coverage-istanbul-reporter"),
+      require("@angular-devkit/build-angular/plugins/karma"),
     ],
     client: {
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, './coverage/application'),
-      reports: ['html', 'lcovonly', 'text-summary'],
-      fixWebpackSourcePaths: true
+      dir: require("path").join(__dirname, "./coverage/application"),
+      reports: ["html", "lcovonly", "text-summary"],
+      fixWebpackSourcePaths: true,
     },
-    reporters: ['progress', 'kjhtml'],
+    reporters: ["progress", "kjhtml"],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ["Chrome"],
     singleRun: false,
-    restartOnFileChange: true
+    restartOnFileChange: true,
   });
 };

server/mock-server.js

@@ -31,21 +31,21 @@ app.use(cors()).use(cookieParser());
  * Please fill this in for the mock-server to function correctly.
  */
 // TODO: YOUR APP CLIENT ID AND SECRET HERE
-var client_id = "id"; 
+var client_id = "id";
 var client_secret = "secret";
 // TODO: Your redirect uri as entered in your Spotify app
 var redirect_uri = "http://localhost:8888/callback/";
 var basePath = "http://localhost:4200"; // For the frontend, this is the default port for Angular
 
-
 /**
  * Generates a random string containing numbers and letters
  * @param  {number} length The length of the string
  * @return {string} The generated string
  */
-var generateRandomString = function(length) {
-  var text = '';
-  var possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+var generateRandomString = function (length) {
+  var text = "";
+  var possible =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
   for (var i = 0; i < length; i++) {
     text += possible.charAt(Math.floor(Math.random() * possible.length));
@@ -229,7 +229,7 @@ app.post("/postchallengescore", function (req, res) {
 });
 
 app.get("/cleanchallenges", function (req, res) {
-  return res.json({status: "success"});
+  return res.json({ status: "success" });
 });
 
 app.get("/api/user/:user", function (req, res) {
@@ -243,7 +243,7 @@ app.get("/api/user/:user", function (req, res) {
     instrumentalness: 0.5,
     tempo: 125,
     loudness: 0.5,
-  })
+  });
 });
 
 app.get("/api/features/user/:user", cors(), function (req, res) {
@@ -257,21 +257,23 @@ app.get("/api/features/user/:user", cors(), function (req, res) {
     instrumentalness: 0.5,
     tempo: 125,
     loudness: 0.5,
-  })
+  });
 });
 
 app.get("/api/features/group/:category", cors(), function (req, res) {
-  return res.json([{
-    acousticness: 0.5,
-    danceability: 0.2,
-    energy: 0.2,
-    valence: 0.2,
-    liveness: 0.5,
-    speechiness: 0.3,
-    instrumentalness: 0.3,
-    tempo: 125,
-    loudness: 0.5,
-  }])
+  return res.json([
+    {
+      acousticness: 0.5,
+      danceability: 0.2,
+      energy: 0.2,
+      valence: 0.2,
+      liveness: 0.5,
+      speechiness: 0.3,
+      instrumentalness: 0.3,
+      tempo: 125,
+      loudness: 0.5,
+    },
+  ]);
 });
 
 app.post("/api/postanalysis", function (req, res) {