Skip to content

Commit

Permalink
Merge pull request #83 from NMSCD/dev
Browse files Browse the repository at this point in the history
bump bulma to 1.0
  • Loading branch information
Lenni009 authored Jul 16, 2024
2 parents 1996aaf + 5ab6a53 commit e75d763
Show file tree
Hide file tree
Showing 12 changed files with 366 additions and 328 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# BaseReorder
# Base Reorder

This web app allows you to reorder the bases in the teleporter UI in No Man's
Sky by simply drag'n'dropping them where you want them to be.
Expand All @@ -13,4 +13,4 @@ npm i
To start the dev server, run
```bat
npm run dev
```
```
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>BaseReorder</title>
<title>Base Reorder</title>
<script
src="./src/main.ts"
type="module"
Expand All @@ -15,20 +15,20 @@

<body>
<div class="container">
<nav>
<nav class="my-4">
<a
href=".."
title="Other pages"
>&larr; View other pages</a
>
</nav>
<main>
<h1 class="title is-3">BaseReorder</h1>
<h1 class="title is-3 has-text-centered">Base Reorder</h1>
<section id="input">
<div class="columns">
<div class="column is-four-fifths">
<label for="JSONinput">Copy your PersistentPlayerBases JSON section here:</label>
<textarea id="JSONinput"></textarea>
<textarea id="JSONinput" class="textarea"></textarea>
</div>
<div
id="checkboxes"
Expand Down
412 changes: 211 additions & 201 deletions package-lock.json

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview"
"preview": "vite preview",
"format": "prettier --write src/"
},
"devDependencies": {
"@tsconfig/node20": "^20.1.2",
"@types/node": "^20.11.5",
"@types/sortablejs": "^1.15.1",
"sass": "^1.62.1",
"typescript": "^5.3.3",
"vite": "^5.0.12"
"@types/node": "^20.14.10",
"@types/sortablejs": "^1.15.8",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"typescript": "^5.5.3",
"vite": "^5.3.3"
},
"dependencies": {
"bulma": "^0.9.4",
"bulma": "^1.0.1",
"sortablejs": "^1.15.0"
}
}
3 changes: 1 addition & 2 deletions src/input.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Sortable from 'sortablejs';
import { hideCopyBtn, stateObj } from './main';
import { stateObj } from './main';

export function generateData(element: HTMLTextAreaElement): void {
const jsonData = element.value;
const isValid = validateJSON(jsonData);
hideCopyBtn();
warn();
if (!jsonData) return;

Expand Down
7 changes: 0 additions & 7 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,3 @@ export const stateObj = {
};

generateData(document.getElementById('JSONinput') as HTMLTextAreaElement);

// remove this when :has() works in Firefox
export function hideCopyBtn() {
const copyBtn = document.getElementById('copy');

copyBtn!.style.display = stateObj.inputJson ? '' : 'none';
}
3 changes: 3 additions & 0 deletions src/output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { stateObj } from './main';
export function copyData(input: HTMLButtonElement) {
const buttonText = input.innerHTML;
input.style.pointerEvents = 'none';
const outlinedClassName = 'is-outlined';
input.classList.remove(outlinedClassName);
try {
outputJSON();
} catch (error) {
Expand All @@ -24,6 +26,7 @@ export function copyData(input: HTMLButtonElement) {
setTimeout(() => {
input.innerHTML = buttonText;
input.style.pointerEvents = '';
input.classList.add(outlinedClassName);
}, 1500); // NoSonar wait 1.5s before switching the button back to normal
}

Expand Down
4 changes: 0 additions & 4 deletions src/scss/_variables.scss

This file was deleted.

66 changes: 29 additions & 37 deletions src/scss/style.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
@use 'variables' as vars;

html,
body {
font-family: sans-serif;
}

h1 {
text-align: center;
:root {
--base-light: hsl(0, 0%, 90%);
--base-dark: hsl(0, 0%, 85%);
--base-hover: hsl(0, 0%, 77%);
--base-focus: hsl(0, 0%, 70%);
--card-colour: black;
--link-hover: #363636;
}

@media (prefers-color-scheme: dark) {
:root {
--base-light: hsl(0, 0%, 20%);
--base-dark: hsl(0, 0%, 25%);
--base-hover: hsl(0, 0%, 33%);
--base-focus: hsl(0, 0%, 40%);
--card-colour: white;
--link-hover: #c9c9c9;
}
}

@media only screen and (max-width: 1023px) {
Expand All @@ -15,30 +24,21 @@ h1 {
}
}

nav {
margin-block: 1rem;
}

hr {
background-color: lightgrey;
border-radius: 5px;
}

@for $i from 0 through 2 {
#bases > div:nth-of-type(9n - #{$i}) {
border-block-end: 2px solid black;
border-block-end: 2px solid var(--card-colour);
margin-block-end: 1rem;
}
}

@for $i from 0 through 8 {
#bases > div {
&:nth-of-type(9n - #{$i}) {
background-color: vars.$base-light;
background-color: var(--base-light);
}

&:nth-of-type(18n - #{$i}) {
background-color: vars.$base-dark;
background-color: var(--base-dark);
}
}
}
Expand All @@ -58,6 +58,7 @@ hr {
display: grid;
grid-template-columns: repeat(3, 1fr);
margin: 0 0.3rem;
color: var(--card-colour);

& > div {
padding: 1rem;
Expand All @@ -76,11 +77,11 @@ hr {
}

&:not(.immovable):hover {
background-color: vars.$base-hover;
background-color: var(--base-hover);
}

&.sortable-chosen {
background-color: vars.$base-focus !important;
background-color: var(--base-focus) !important;
cursor: grabbing;
}

Expand All @@ -98,26 +99,13 @@ hr {
display: none;
}

textarea {
padding: 0 5px;
border-radius: 5px;
border: 1px solid #2f4f4fb0;
min-height: 10rem;
min-width: 100%;
resize: vertical;

&:hover {
border: 1px solid black;
}
}

#copy.button {
margin-inline-start: 0.3rem;
}

label {
display: block;
margin-block-end: 3px;
margin-block-end: 0.25rem;
font-weight: bold;
}

Expand All @@ -143,3 +131,7 @@ label {
z-index: -1;
color: gray;
}

a:hover {
color: var(--link-hover);
}
36 changes: 0 additions & 36 deletions tsconfig.app.json

This file was deleted.

116 changes: 107 additions & 9 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,109 @@
{
"files": [],
"references": [
{
"path": "./tsconfig.node.json"
},
{
"path": "./tsconfig.app.json"
}
]
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
"composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "ESNext", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
"lib": ["ESNext", "DOM"], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
"useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "ESNext", /* Specify what module code is generated. */
// "rootDir": "./", /* Specify the root folder within your source files. */
"moduleResolution": "Bundler", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
"paths": {"@/*": ["./src/*"]}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
"resolveJsonModule": true, /* Enable importing .json files. */
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
"outDir": "dist", /* Specify an output folder for all emitted files. */
// "removeComments": true, /* Disable emitting comments. */
"noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */

/* Interop Constraints */
"isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
"verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */

/* Type Checking */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
"noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
"noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
"noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
}
}
Loading

0 comments on commit e75d763

Please sign in to comment.