fix: fixed naming, formatting and makefile

adfinis · Oct 23, 2023 · 4deca23 · 4deca23
1 parent 9404715
commit 4deca23
Show file tree

Hide file tree

Showing 26 changed files with 460 additions and 461 deletions.
diff --git a/Makefile b/Makefile
@@ -7,42 +7,43 @@ help:
 .PHONY: start-backend
 start-backend: ## Starts only the backend
 	@docker-compose up -d --build
-	@cd backend/;poetry run ./manage.py runserver
+	@cd backend/ && poetry run ./manage.py runserver
 
 .PHONY: start-frontend-using-backend
 start-frontend-using-backend: ## Start the frontend, using the API
-	@cd frontend/; yarn ember server --proxy=http://localhost:8000
+	@cd frontend/ && yarn ember server --proxy=http://localhost:8000
 
 .PHONY: start-frontend
 start-frontend: ## Start the frontend, using Mirage
-	@cd frontend/; yarn ember s
+	@cd frontend/ && yarn ember s
 
 .PHONY: lint-backend
 lint-backend: ## Lint the backend
-	@cd backend/; poetry run black .; poetry run isort .; poetry run flake8; 
+	@cd backend/ && poetry run black . 
+	@cd backend/ && poetry run flake8
 
 .PHONY: lint-frontend
 lint-frontend: ## Lint the frontend
-	@cd frontend/; yarn lint
+	@cd frontend/ && yarn lint
 
 .PHONY: lint
 lint: lint-backend lint-frontend ## Lint front- & backend
 
 .PHONY: test-backend
 test-backend: ## Test the backend
-	@cd backend/; poetry run pytest --no-cov-on-fail --cov
+	@cd backend/ && poetry run pytest --no-cov-on-fail --cov
 
 .PHONY: test-frontend
 test-frontend: ## Test the frontend
-	@cd frontend/; yarn test
+	@cd frontend/ && yarn test
 
 .PHONY: test
 test: test-backend test-frontend ## Test front- & backend
 
 .PHONY: makemigrations
 makemigrations: ## Make django migrations
-	@cd backend/; poetry run ./manage.py makemigrations
+	@cd backend/ && poetry run ./manage.py makemigrations
 
 .PHONY: migrate
 migrate: ## Migrate django
-	@cd backend/; poetry run ./manage.py migrate
+	@cd backend/ && poetry run ./manage.py migrate
diff --git a/.editorconfig → frontend/.editorconfig b/.editorconfig → frontend/.editorconfig
@@ -1,3 +1,7 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
 root = true
 
 [*]

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
@@ -1,58 +1,5 @@
 'use strict';
 
 module.exports = {
-  root: true,
-  parser: 'babel-eslint',
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
-    },
-  },
-  plugins: ['ember'],
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended',
-    'plugin:prettier/recommended',
-  ],
-  env: {
-    browser: true,
-  },
-  rules: {},
-  overrides: [
-    // node files
-    {
-      files: [
-        './.eslintrc.js',
-        './.prettierrc.js',
-        './.template-lintrc.js',
-        './ember-cli-build.js',
-        './testem.js',
-        './blueprints/*/index.js',
-        './config/**/*.js',
-        './lib/*/index.js',
-        './server/**/*.js',
-      ],
-      parserOptions: {
-        sourceType: 'script',
-      },
-      env: {
-        browser: false,
-        node: true,
-      },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
-      rules: {
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off',
-      },
-    },
-    {
-      // test files
-      files: ['tests/**/*-test.{js,ts}'],
-      extends: ['plugin:qunit/recommended'],
-    },
-  ],
+  extends: '@adfinis-sygroup/eslint-config/ember-app',
 };
diff --git a/frontend/README.md b/frontend/README.md
@@ -7,51 +7,51 @@ A short introduction of this app could easily go here.
 
 You will need the following things properly installed on your computer.
 
-* [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/)
-* [Yarn](https://yarnpkg.com/)
-* [Ember CLI](https://cli.emberjs.com/release/)
-* [Google Chrome](https://google.com/chrome/)
+- [Git](https://git-scm.com/)
+- [Node.js](https://nodejs.org/)
+- [Yarn](https://yarnpkg.com/)
+- [Ember CLI](https://cli.emberjs.com/release/)
+- [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 
-* `git clone <repository-url>` this repository
-* `cd outdated`
-* `yarn install`
+- `git clone <repository-url>` this repository
+- `cd outdated`
+- `yarn install`
 
 ## Running / Development
 
-* `ember serve`
-* Visit your app at [http://localhost:4200](http://localhost:4200).
-* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
+- `ember serve`
+- Visit your app at [http://localhost:4200](http://localhost:4200).
+- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
 ### Code Generators
 
 Make use of the many generators for code, try `ember help generate` for more details
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+- `ember test`
+- `ember test --server`
 
 ### Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `yarn lint`
+- `yarn lint:fix`
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+- `ember build` (development)
+- `ember build --environment production` (production)
 
 ### Deploying
 
 Specify what it takes to deploy your app.
 
 ## Further Reading / Useful Links
 
-* [ember.js](https://emberjs.com/)
-* [ember-cli](https://cli.emberjs.com/release/)
-* Development Browser Extensions
-  * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
-  * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
+- [ember.js](https://emberjs.com/)
+- [ember-cli](https://cli.emberjs.com/release/)
+- Development Browser Extensions
+  - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
+  - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
diff --git a/frontend/app/app.js b/frontend/app/app.js
@@ -1,6 +1,6 @@
 import Application from '@ember/application';
-import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
+import Resolver from 'ember-resolver';
 import config from 'outdated/config/environment';
 
 export default class App extends Application {

diff --git a/frontend/app/components/dependency-detailed/template.hbs b/frontend/app/components/dependency-detailed/template.hbs
@@ -1,8 +1,14 @@
-<tr data-test-version-status class='text-{{@version.status}}'><td
-    data-test-version-dependency-name
-  >{{@version.dependency.name}}</td><td
-    data-test-version-version
-  >{{@version.version}}</td><td data-test-version-eol-date>
-    {{format-date @version.eolDate}}</td><td
-    data-test-version-release-date
-  >{{format-date @version.releaseDate}}</td></tr>
+<tr data-test-version-status class='text-{{@version.status}}'>
+  <td data-test-version-dependency-name>
+    {{@version.dependency.name}}
+  </td>
+  <td data-test-version-version>
+    {{@version.version}}
+  </td>
+  <td data-test-version-eol-date>
+    {{format-date @version.eolDate}}
+  </td>
+  <td data-test-version-release-date>
+    {{format-date @version.releaseDate}}
+  </td>
+</tr>
diff --git a/frontend/app/components/project-compact/component.js b/frontend/app/components/project-compact/component.js
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 
 export default class ProjectCompactComponent extends Component {
   get icon() {
-    let { project } = this.args;
+    const { project } = this.args;
     const stateIconDict = {
       OUTDATED: 'bolt',
       WARNING: 'warning',
@@ -12,7 +12,7 @@ export default class ProjectCompactComponent extends Component {
     return stateIconDict[project.status];
   }
   get version() {
-    let { project } = this.args;
+    const { project } = this.args;
     return project.dependencyVersions.toArray()[0];
   }
 }
diff --git a/frontend/app/components/project-compact/template.hbs b/frontend/app/components/project-compact/template.hbs
@@ -7,15 +7,14 @@
       data-test-project-link='{{@project.id}}'
       @model={{@project}}
     >
-      <h3
-        data-test-project-name
-        class='title-compact'
-      >{{@project.name}}</h3></LinkTo>
+      <h3 data-test-project-name class='title-compact'>
+        {{@project.name}}
+      </h3>
+    </LinkTo>
 
     <card.body data-test-project-status class='text-{{@project.status}}'>
 
       <UkIcon @icon='{{this.icon}}' @ratio={{4}} />
-
       <DependencyCompact @version={{this.version}} />
 
     </card.body>

diff --git a/frontend/app/components/project-detailed/template.hbs b/frontend/app/components/project-detailed/template.hbs
@@ -3,23 +3,26 @@
   <div class='detailed-header'>
 
     <h1 data-test-project-name>
-
       {{@project.name}}
-
     </h1>
 
-    <a href='{{@project.repo}}' target='blank_' data-test-repo-link><UkIcon
-        @icon='github'
-        @ratio={{3}}
-      /></a>
+    <a href='{{@project.repo}}' target='blank_' data-test-repo-link>
+      <UkIcon @icon='github' @ratio={{3}} />
+    </a>
 
   </div>
 
   <p class='seperator'></p>
   {{#if @project.dependencyVersions}}
     <table>
-      <thead><tr><th>Dependency</th><th>Version</th><th>End Of Life Date</th><th
-          >Release Date</th></tr></thead>
+      <thead>
+        <tr>
+          <th>Dependency</th>
+          <th>Version</th>
+          <th>End Of Life Date</th>
+          <th>Release Date</th>
+        </tr>
+      </thead>
 
       <tbody>
         {{#each
@@ -33,7 +36,8 @@
     </table>
   {{else}}
     <div class='none-yet' data-test-dependency-versions-none>
-      <span class='text-UNDEFINED'>No dependencies yet</span></div>
+      <span class='text-UNDEFINED'>No dependencies yet</span>
+    </div>
   {{/if}}
 
 </div>
diff --git a/frontend/app/components/top-nav/template.hbs b/frontend/app/components/top-nav/template.hbs
@@ -5,23 +5,27 @@
   <nav class='navbar-container' uk-navbar>
     <div class='uk-navbar-left'>
       <LinkTo @route='projects' class='uk-navbar-item uk-logo'>
-        Outdated</LinkTo>
+        Outdated
+      </LinkTo>
     </div>
     <div class='uk-navbar-right'>
       <ul class='uk-navbar-nav uk-navbar-left'>
         <div class='button-nav'>
           <li>
 
-            <LinkTo @route='projects'><UkButton
-                @size='large'
-              >Overview</UkButton></LinkTo>
+            <LinkTo @route='projects'>
+              <UkButton @size='large'>
+                Overview
+              </UkButton>
+            </LinkTo>
           </li>
 
           <li>
-            <LinkTo @route='manage'><UkButton
-                @size='large'
-              >Manage</UkButton></LinkTo>
-          </li></div>
+            <LinkTo @route='manage'>
+              <UkButton @size='large'>Manage</UkButton>
+            </LinkTo>
+          </li>
+        </div>
       </ul>
     </div>
   </nav>

diff --git a/frontend/app/router.js b/frontend/app/router.js
@@ -6,6 +6,7 @@ export default class Router extends EmberRouter {
   rootURL = config.rootURL;
 }
 
+// eslint-disable-next-line array-callback-return
 Router.map(function () {
   this.route('projects', { path: '/' }, function () {
     this.route('project-detailed', { path: 'projects/:id' });

diff --git a/frontend/app/routes/projects/index.js b/frontend/app/routes/projects/index.js
@@ -1,7 +1,7 @@
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
-export default class ProjectsProjectsRoute extends Route {
+export default class ProjectsRoute extends Route {
   @service store;
   model() {
     return this.store.findAll('project', {

diff --git a/frontend/app/routes/projects/project-detailed.js b/frontend/app/routes/projects/project-detailed.js
@@ -1,6 +1,6 @@
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-export default class ProjectsProjectDetailedRoute extends Route {
+export default class ProjectDetailedRoute extends Route {
   @service store;
   model(params) {
     return this.store.findRecord('project', params.id, {

diff --git a/frontend/mirage/factories/dependency-version.js b/frontend/mirage/factories/dependency-version.js
@@ -1,6 +1,6 @@
-import { Factory, trait } from 'miragejs';
 import { faker } from '@faker-js/faker';
 import { DateTime } from 'luxon';
+import { Factory, trait } from 'miragejs';
 
 export default Factory.extend({
   version: () => faker.system.semver(),

diff --git a/frontend/mirage/factories/dependency.js b/frontend/mirage/factories/dependency.js
@@ -1,5 +1,5 @@
-import { Factory, hasMany } from 'miragejs';
 import { faker } from '@faker-js/faker';
+import { Factory, hasMany } from 'miragejs';
 export default Factory.extend({
   name: () =>
     faker.helpers.arrayElement([