Skip to content
This repository was archived by the owner on Sep 21, 2025. It is now read-only.
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
14 changes: 13 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,17 @@
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
*/
"isTypeScriptProject": false
"isTypeScriptProject": false,

/**
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
or GTS files for the component and the component rendering test. "loose" is the default.
*/
"componentAuthoringFormat": "strict",

/**
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
or GTS templates for routes. "loose" is the default
*/
"routeAuthoringFormat": "strict"
}
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 22
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -35,11 +36,12 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 22
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/tmp/

# compiled output
/dist/
/declarations/
Expand All @@ -14,12 +16,5 @@
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
9 changes: 6 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# unconventional js
/blueprints/*/files/

# vendored bootstrap CSS
/public/vendor/bootstrap.css

# compiled output
/dist/

# misc
/coverage/
!.*
.*/

# ember-try
/.node_modules.ember-try/
/pnpm-lock.yaml
ember-cli-update.json
*.html
3 changes: 2 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ module.exports = {
plugins: ['prettier-plugin-ember-template-tag'],
overrides: [
{
files: '*.{js,ts,gjs,gts}',
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
options: {
singleQuote: true,
templateSingleQuote: true,
},
},
// ...
Expand Down
9 changes: 3 additions & 6 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# unconventional files
/blueprints/*/files/

# vendored bootstrap CSS
/public/vendor/bootstrap.css

# compiled output
/dist/

# addons
/.node_modules.ember-try/

# vendor
public/vendor/*
2 changes: 1 addition & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
extends: ['stylelint-config-standard'],
rules: {
'custom-property-pattern': null,
'block-no-empty': null,
Expand Down
13 changes: 10 additions & 3 deletions app/app.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'netrunnerdb/config/environment';
import config from './config/environment';
import './font-awesome'; // Add this import statement for Font Awesome setup
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';

import compatModules from '@embroider/virtual/compat-modules';

if (macroCondition(isDevelopingApp())) {
importSync('./deprecation-workflow');
}

export default class App extends Application {
modulePrefix = config.modulePrefix;
podModulePrefix = config.podModulePrefix;
Resolver = Resolver;
Resolver = Resolver.withModules(compatModules);
}

loadInitializers(App, config.modulePrefix);
loadInitializers(App, config.modulePrefix, compatModules);
3 changes: 2 additions & 1 deletion app/components/banlist/banned.gjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import Component from '@glimmer/component';
import { cached } from '@glimmer/tracking';
import CardLinkTo from '../card/link-to';

const capitalize = 'text-transform: capitalize';

export default class Banned extends Component {
get bannedCards() {
@cached get bannedCards() {
return this.args.restriction.verdicts.banned
.map((cardId) => {
return this.args.cards.get(cardId);
Expand Down
4 changes: 2 additions & 2 deletions app/components/decklist-box.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
import { LinkTo } from '@ember/routing';
import { service } from '@ember/service';
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
import { faCardsBlank } from '@fortawesome/free-solid-svg-icons';
import { faLayerGroup } from '@fortawesome/free-solid-svg-icons';

import {
GetIdentityTitle,
Expand Down Expand Up @@ -71,7 +71,7 @@ export default class DecklistBoxComponent extends Component {
}})
</p>
<p class='decklist-cards'>
<FaIcon @icon={{faCardsBlank}} @flip='horizontal' />
<FaIcon @icon={{faLayerGroup}} @flip='horizontal' />
{{@decklist.numCards}}
cards (min
{{@decklist.identityCard.minimumDeckSize}})
Expand Down
7 changes: 1 addition & 6 deletions app/components/navbar.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import { action } from '@ember/object';
import { LinkTo } from '@ember/routing';
import { on } from '@ember/modifier';
import FaIcon from '@fortawesome/ember-fontawesome/components/fa-icon';
import {
faBars,
faFantasyFlightGames,
} from '@fortawesome/free-solid-svg-icons';
import { faBars } from '@fortawesome/free-solid-svg-icons';

import Collapse from 'ember-bootstrap/components/bs-collapse';
import formatMessage from 'ember-intl/helpers/format-message';
Expand All @@ -29,8 +26,6 @@ class Navbar extends Component {

<template>
<nav id='top-nav' class='col py-4'>
<FaIcon @icon={{faFantasyFlightGames}} />

<div class='container'>
<div class='row'>
<div class='col-12 col-lg-3 mb-4 mb-lg-0'>
Expand Down
3 changes: 3 additions & 0 deletions app/config/environment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import loadConfigFromMeta from '@embroider/config-meta-loader';

export default loadConfigFromMeta('netrunnerdb');
24 changes: 24 additions & 0 deletions app/deprecation-workflow.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';

/**
* Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
*/
setupDeprecationWorkflow({
/**
false by default, but if a developer / team wants to be more aggressive about being proactive with
handling their deprecations, this should be set to "true"
*/
throwOnUnhandled: false,
workflow: [
/* ... handlers ... */
/* to generate this list, run your app for a while (or run the test suite),
* and then run in the browser console:
*
* deprecationWorkflow.flushDeprecations()
*
* And copy the handlers here
*/
/* example: */
/* { handler: 'silence', matchId: 'template-action' }, */
],
});
32 changes: 16 additions & 16 deletions app/templates/formats/format.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ import Navbar from 'netrunnerdb/components/navbar';
import FancyHeader from 'netrunnerdb/components/fancy-header';

const FormatSection = <template>
<div class="col-12">
<div class='col-12'>
<FancyHeader>{{@format.name}}</FancyHeader>
<img
alt={{@format.name}}
src="/assets/image/format/{{@format.name}}.png"
class="float-{{@float}} me-4"
style="width: 100px"
src='/assets/image/format/{{@format.name}}.png'
class='float-{{@float}} me-4'
style='width: 100px'
/>

{{yield to="description"}}
{{yield to='description'}}

<h3>Current Ban List</h3>
<p>
<LinkTo
@route="bans"
@route='bans'
@query={{hash format=@format.id search=@format.currentRestriction.name}}
>
{{formatMessage
"{name} active as of {dateStart}"
'{name} active as of {dateStart}'
name=@format.currentRestriction.name
dateStart=(formatDate
@format.currentRestriction.dateStart
day="numeric"
month="long"
year="numeric"
day='numeric'
month='long'
year='numeric'
)
}}
</LinkTo>
Expand All @@ -41,16 +41,16 @@ const FormatSection = <template>
</template>;

<template>
{{pageTitle "Formats"}}
{{pageTitle 'Formats'}}

<main class="pb-4">
<main class='pb-4'>

<Navbar />
<Titlebar @title="Formats" @subtitle={{@model.standard.format.name}} />
<Titlebar @title='Formats' @subtitle={{@model.standard.format.name}} />

<div class="container">
<div class="row">
<FormatSection @format={{@model.standard.format}} @float="start">
<div class='container'>
<div class='row'>
<FormatSection @format={{@model.standard.format}} @float='start'>
<:description>
<p>
The flagship format of Netrunner Organized Play, Standard is
Expand Down
Loading