diff --git a/.gitignore b/.gitignore index aecbd17d..df908700 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,22 @@ tasks-tracker-plugin-master/nbproject/ tasks-tracker-plugin-master/.run tasks-tracker-plugin-master/bin tasks-tracker-plugin-master/**/FileDataStoreReader.java + + +os-league-tools-master//node_modules +os-league-tools-master//.pnp +os-league-tools-master/.pnp.js +os-league-tools-master//coverage +os-league-tools-master//build +os-league-tools-master/.DS_Store +os-league-tools-master/.env.local +os-league-tools-master/.env.development.local +os-league-tools-master/.env.test.local +os-league-tools-master/.env.production.local +os-league-tools-master/npm-debug.log* +os-league-tools-master/yarn-debug.log* +os-league-tools-master/yarn-error.log* +os-league-tools-master/.~lock.*# +os-league-tools-master//docs +os-league-tools-master/.env +os-league-tools-master//.vscode \ No newline at end of file diff --git a/os-league-tools-master/.eslintrc.js b/os-league-tools-master/.eslintrc.js new file mode 100644 index 00000000..9dc351d5 --- /dev/null +++ b/os-league-tools-master/.eslintrc.js @@ -0,0 +1,40 @@ +module.exports = { + env: { + browser: true, + es2021: true, + }, + extends: ['plugin:react/recommended', 'airbnb', 'prettier'], + parserOptions: { + ecmaFeatures: { + jsx: true, + }, + ecmaVersion: 12, + sourceType: 'module', + }, + plugins: ['react', 'react-hooks'], + rules: { + curly: ['error', 'all'], + indent: 'off', + 'no-console': ['error', { allow: ['warn', 'error'] }], + 'no-else-return': ['error', { allowElseIf: true }], + 'no-plusplus': 'off', + 'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'], + 'no-use-before-define': ['error', { functions: false }], + 'no-nested-ternary': 'off', + 'react/jsx-curly-newline': 'off', + 'react/jsx-filename-extension': 'off', + 'react/jsx-indent': 'off', + 'react/jsx-indent-props': 'off', + 'react/jsx-props-no-spreading': 'off', + 'react/function-component-definition': 'off', + 'react/no-array-index-key': 'off', + 'react/no-unescaped-entities': 'off', + 'react/jsx-one-expression-per-line': 'off', + 'react/prop-types': 'off', + 'jsx-a11y/no-static-element-interactions': 'off', + 'jsx-a11y/click-events-have-key-events': 'off', + 'jsx-a11y/no-noninteractive-element-interactions': 'off', + 'jsx-a11y/control-has-associated-label': 'off', + }, + ignorePatterns: ['/config', '/build', '/scripts'], +}; diff --git a/os-league-tools-master/.gitattributes b/os-league-tools-master/.gitattributes new file mode 100644 index 00000000..6313b56c --- /dev/null +++ b/os-league-tools-master/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf diff --git a/os-league-tools-master/.github/workflows/deploy.yml b/os-league-tools-master/.github/workflows/deploy.yml new file mode 100644 index 00000000..bef9b6ef --- /dev/null +++ b/os-league-tools-master/.github/workflows/deploy.yml @@ -0,0 +1,24 @@ +name: Build and Deploy to GH Pages +on: [workflow_dispatch] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install and build + run: | + npm install + npm run build + env: + REACT_APP_GA_MID: ${{ secrets.REACT_APP_GA_MID }} + + - name: Deploy to GitHub Pages + if: success() + uses: crazy-max/ghaction-github-pages@v2 + with: + target_branch: gh-pages + build_dir: build + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/os-league-tools-master/.gitignore b/os-league-tools-master/.gitignore new file mode 100644 index 00000000..2268ed66 --- /dev/null +++ b/os-league-tools-master/.gitignore @@ -0,0 +1,35 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# csv working files +.~lock.*# + +# misc docs that don't need to be published +/docs + +# production configs +.env + +# VSCode Settings +/.vscode \ No newline at end of file diff --git a/os-league-tools-master/.husky/pre-commit b/os-league-tools-master/.husky/pre-commit new file mode 100644 index 00000000..36af2198 --- /dev/null +++ b/os-league-tools-master/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +npx lint-staged diff --git a/os-league-tools-master/.prettierignore b/os-league-tools-master/.prettierignore new file mode 100644 index 00000000..f7a78a2e --- /dev/null +++ b/os-league-tools-master/.prettierignore @@ -0,0 +1,4 @@ +# Ignore artifacts: +build +coverage +/src/styles/compiled.css diff --git a/os-league-tools-master/.prettierrc.json b/os-league-tools-master/.prettierrc.json new file mode 100644 index 00000000..e4e1eca4 --- /dev/null +++ b/os-league-tools-master/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "tabWidth": 2, + "singleQuote": true, + "jsxSingleQuote": true, + "printWidth": 120, + "arrowParens": "avoid" +} diff --git a/os-league-tools-master/LICENSE b/os-league-tools-master/LICENSE new file mode 100644 index 00000000..1003a472 --- /dev/null +++ b/os-league-tools-master/LICENSE @@ -0,0 +1,7 @@ +Copyright 2020 chaiinchomp + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/os-league-tools-master/README.md b/os-league-tools-master/README.md new file mode 100644 index 00000000..c0926487 --- /dev/null +++ b/os-league-tools-master/README.md @@ -0,0 +1,47 @@ +![](/public/logo.png) + +# O S - L E A G U E - T O O L S + +## >> [https://osleague.tools](https://www.osleague.tools) << + +Your hub for all your OSRS leagues needs - calculators, relics info, task tracking and planning, and more! + +Looking for more info, or have a bug report or suggestion? Check out the [Discord server](https://discord.gg/GQ5kVyU). + +## Contributing + +New contributors are always welcome. If you're interested in helping develop the site, take a look at the [issue tracker](https://os-league-tools.height.app/trailblazer-reloaded) to see what kind of things we are working on, and come by the [Discord](https://discord.gg/GQ5kVyU) to chat about what you'd like to help with. + +### Code style + +This project uses pre-commit hooks with [ESLint](https://eslint.org/) and [Prettier](https://prettier.io/) to maintain a consistent code style. + +## Development + +### Build + +To build and start up locally, run: + +``` +npm install +npm run dev +``` + +and open [http://localhost:3000](http://localhost:3000) to view it in the browser. + +### Theming and styles + +All styling is done using [TailwindCSS](https://tailwindcss.com/docs) utility classes. Unused CSS classes are pruned by tailwind's preprocessor, so if you add any classes that don't already exist somewhere in the project, you'll need to regenerate the compiled CSS to see it reflected in the site. + +Styles are always regenerated during the dev build step, or you can manually regenerate them with: + +``` +npm run build:styles +``` + +### Backend + +Some functionality (hiscores, submitting feedback, anything to do with user data) relies on the Reldo backend API. If you need to test any of these features during local development, you will can either: + +- To develop against a local version of the API, clone [osrs-reldo-api](https://github.com/osrs-reldo/osrs-reldo-api) and start it up. The app will look for it on port 8080 by default. +- Or if you just want to hit the prod endpoint, create a `.env` file in this project's root folder and add the env variable: `REACT_APP_RELDO_URL=https://osrs-reldo-api.herokuapp.com` diff --git a/os-league-tools-master/config/env.js b/os-league-tools-master/config/env.js new file mode 100644 index 00000000..239f09e0 --- /dev/null +++ b/os-league-tools-master/config/env.js @@ -0,0 +1,102 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const paths = require('./paths'); + +// Make sure that including paths.js after env.js will read .env variables. +delete require.cache[require.resolve('./paths')]; + +const NODE_ENV = process.env.NODE_ENV; +if (!NODE_ENV) { + throw new Error('The NODE_ENV environment variable is required but was not specified.'); +} + +// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use +const dotenvFiles = [ + `${paths.dotenv}.${NODE_ENV}.local`, + // Don't include `.env.local` for `test` environment + // since normally you expect tests to produce the same + // results for everyone + NODE_ENV !== 'test' && `${paths.dotenv}.local`, + `${paths.dotenv}.${NODE_ENV}`, + paths.dotenv, +].filter(Boolean); + +// Load environment variables from .env* files. Suppress warnings using silent +// if this file is missing. dotenv will never modify any environment variables +// that have already been set. Variable expansion is supported in .env files. +// https://github.com/motdotla/dotenv +// https://github.com/motdotla/dotenv-expand +dotenvFiles.forEach(dotenvFile => { + if (fs.existsSync(dotenvFile)) { + require('dotenv-expand')( + require('dotenv').config({ + path: dotenvFile, + }) + ); + } +}); + +// We support resolving modules according to `NODE_PATH`. +// This lets you use absolute paths in imports inside large monorepos: +// https://github.com/facebook/create-react-app/issues/253. +// It works similar to `NODE_PATH` in Node itself: +// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders +// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. +// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims. +// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 +// We also resolve them to make sure all tools using them work consistently. +const appDirectory = fs.realpathSync(process.cwd()); +process.env.NODE_PATH = (process.env.NODE_PATH || '') + .split(path.delimiter) + .filter(folder => folder && !path.isAbsolute(folder)) + .map(folder => path.resolve(appDirectory, folder)) + .join(path.delimiter); + +// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be +// injected into the application via DefinePlugin in webpack configuration. +const REACT_APP = /^REACT_APP_/i; + +function getClientEnvironment(publicUrl) { + const raw = Object.keys(process.env) + .filter(key => REACT_APP.test(key)) + .reduce( + (env, key) => { + env[key] = process.env[key]; + return env; + }, + { + // Useful for determining whether we’re running in production mode. + // Most importantly, it switches React into the correct mode. + NODE_ENV: process.env.NODE_ENV || 'development', + // Useful for resolving the correct path to static assets in `public`. + // For example, . + // This should only be used as an escape hatch. Normally you would put + // images into the `src` and `import` them in code to get their paths. + PUBLIC_URL: publicUrl, + // We support configuring the sockjs pathname during development. + // These settings let a developer run multiple simultaneous projects. + // They are used as the connection `hostname`, `pathname` and `port` + // in webpackHotDevClient. They are used as the `sockHost`, `sockPath` + // and `sockPort` options in webpack-dev-server. + WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, + WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, + WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, + // Whether or not react-refresh is enabled. + // It is defined here so it is available in the webpackHotDevClient. + FAST_REFRESH: process.env.FAST_REFRESH !== 'false', + } + ); + // Stringify all values so we can feed into webpack DefinePlugin + const stringified = { + 'process.env': Object.keys(raw).reduce((env, key) => { + env[key] = JSON.stringify(raw[key]); + return env; + }, {}), + }; + + return { raw, stringified }; +} + +module.exports = getClientEnvironment; diff --git a/os-league-tools-master/config/getHttpsConfig.js b/os-league-tools-master/config/getHttpsConfig.js new file mode 100644 index 00000000..30ec402d --- /dev/null +++ b/os-league-tools-master/config/getHttpsConfig.js @@ -0,0 +1,58 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const crypto = require('crypto'); +const chalk = require('react-dev-utils/chalk'); +const paths = require('./paths'); + +// Ensure the certificate and key provided are valid and if not +// throw an easy to debug error +function validateKeyAndCerts({ cert, key, keyFile, crtFile }) { + let encrypted; + try { + // publicEncrypt will throw an error with an invalid cert + encrypted = crypto.publicEncrypt(cert, Buffer.from('test')); + } catch (err) { + throw new Error(`The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}`); + } + + try { + // privateDecrypt will throw an error with an invalid key + crypto.privateDecrypt(key, encrypted); + } catch (err) { + throw new Error(`The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${err.message}`); + } +} + +// Read file and throw an error if it doesn't exist +function readEnvFile(file, type) { + if (!fs.existsSync(file)) { + throw new Error( + `You specified ${chalk.cyan(type)} in your env, but the file "${chalk.yellow(file)}" can't be found.` + ); + } + return fs.readFileSync(file); +} + +// Get the https config +// Return cert files if provided in env, otherwise just true or false +function getHttpsConfig() { + const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env; + const isHttps = HTTPS === 'true'; + + if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) { + const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE); + const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE); + const config = { + cert: readEnvFile(crtFile, 'SSL_CRT_FILE'), + key: readEnvFile(keyFile, 'SSL_KEY_FILE'), + }; + + validateKeyAndCerts({ ...config, keyFile, crtFile }); + return config; + } + return isHttps; +} + +module.exports = getHttpsConfig; diff --git a/os-league-tools-master/config/jest/babelTransform.js b/os-league-tools-master/config/jest/babelTransform.js new file mode 100644 index 00000000..5b391e40 --- /dev/null +++ b/os-league-tools-master/config/jest/babelTransform.js @@ -0,0 +1,29 @@ +'use strict'; + +const babelJest = require('babel-jest').default; + +const hasJsxRuntime = (() => { + if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') { + return false; + } + + try { + require.resolve('react/jsx-runtime'); + return true; + } catch (e) { + return false; + } +})(); + +module.exports = babelJest.createTransformer({ + presets: [ + [ + require.resolve('babel-preset-react-app'), + { + runtime: hasJsxRuntime ? 'automatic' : 'classic', + }, + ], + ], + babelrc: false, + configFile: false, +}); diff --git a/os-league-tools-master/config/jest/cssTransform.js b/os-league-tools-master/config/jest/cssTransform.js new file mode 100644 index 00000000..8f651148 --- /dev/null +++ b/os-league-tools-master/config/jest/cssTransform.js @@ -0,0 +1,14 @@ +'use strict'; + +// This is a custom Jest transformer turning style imports into empty objects. +// http://facebook.github.io/jest/docs/en/webpack.html + +module.exports = { + process() { + return 'module.exports = {};'; + }, + getCacheKey() { + // The output is always the same. + return 'cssTransform'; + }, +}; diff --git a/os-league-tools-master/config/jest/fileTransform.js b/os-league-tools-master/config/jest/fileTransform.js new file mode 100644 index 00000000..aab67618 --- /dev/null +++ b/os-league-tools-master/config/jest/fileTransform.js @@ -0,0 +1,40 @@ +'use strict'; + +const path = require('path'); +const camelcase = require('camelcase'); + +// This is a custom Jest transformer turning file imports into filenames. +// http://facebook.github.io/jest/docs/en/webpack.html + +module.exports = { + process(src, filename) { + const assetFilename = JSON.stringify(path.basename(filename)); + + if (filename.match(/\.svg$/)) { + // Based on how SVGR generates a component name: + // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6 + const pascalCaseFilename = camelcase(path.parse(filename).name, { + pascalCase: true, + }); + const componentName = `Svg${pascalCaseFilename}`; + return `const React = require('react'); + module.exports = { + __esModule: true, + default: ${assetFilename}, + ReactComponent: React.forwardRef(function ${componentName}(props, ref) { + return { + $$typeof: Symbol.for('react.element'), + type: 'svg', + ref: ref, + key: null, + props: Object.assign({}, props, { + children: ${assetFilename} + }) + }; + }), + };`; + } + + return `module.exports = ${assetFilename};`; + }, +}; diff --git a/os-league-tools-master/config/modules.js b/os-league-tools-master/config/modules.js new file mode 100644 index 00000000..d63e41d7 --- /dev/null +++ b/os-league-tools-master/config/modules.js @@ -0,0 +1,134 @@ +'use strict'; + +const fs = require('fs'); +const path = require('path'); +const paths = require('./paths'); +const chalk = require('react-dev-utils/chalk'); +const resolve = require('resolve'); + +/** + * Get additional module paths based on the baseUrl of a compilerOptions object. + * + * @param {Object} options + */ +function getAdditionalModulePaths(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return ''; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + // We don't need to do anything if `baseUrl` is set to `node_modules`. This is + // the default behavior. + if (path.relative(paths.appNodeModules, baseUrlResolved) === '') { + return null; + } + + // Allow the user set the `baseUrl` to `appSrc`. + if (path.relative(paths.appSrc, baseUrlResolved) === '') { + return [paths.appSrc]; + } + + // If the path is equal to the root directory we ignore it here. + // We don't want to allow importing from the root directly as source files are + // not transpiled outside of `src`. We do allow importing them with the + // absolute path (e.g. `src/Components/Button.js`) but we set that up with + // an alias. + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return null; + } + + // Otherwise, throw an error. + throw new Error( + chalk.red.bold( + "Your project's `baseUrl` can only be set to `src` or `node_modules`." + + ' Create React App does not support other values at this time.' + ) + ); +} + +/** + * Get webpack aliases based on the baseUrl of a compilerOptions object. + * + * @param {*} options + */ +function getWebpackAliases(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return {}; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return { + src: paths.appSrc, + }; + } +} + +/** + * Get jest aliases based on the baseUrl of a compilerOptions object. + * + * @param {*} options + */ +function getJestAliases(options = {}) { + const baseUrl = options.baseUrl; + + if (!baseUrl) { + return {}; + } + + const baseUrlResolved = path.resolve(paths.appPath, baseUrl); + + if (path.relative(paths.appPath, baseUrlResolved) === '') { + return { + '^src/(.*)$': '/src/$1', + }; + } +} + +function getModules() { + // Check if TypeScript is setup + const hasTsConfig = fs.existsSync(paths.appTsConfig); + const hasJsConfig = fs.existsSync(paths.appJsConfig); + + if (hasTsConfig && hasJsConfig) { + throw new Error( + 'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.' + ); + } + + let config; + + // If there's a tsconfig.json we assume it's a + // TypeScript project and set up the config + // based on tsconfig.json + if (hasTsConfig) { + const ts = require(resolve.sync('typescript', { + basedir: paths.appNodeModules, + })); + config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config; + // Otherwise we'll check if there is jsconfig.json + // for non TS projects. + } else if (hasJsConfig) { + config = require(paths.appJsConfig); + } + + config = config || {}; + const options = config.compilerOptions || {}; + + const additionalModulePaths = getAdditionalModulePaths(options); + + return { + additionalModulePaths: additionalModulePaths, + webpackAliases: getWebpackAliases(options), + jestAliases: getJestAliases(options), + hasTsConfig, + }; +} + +module.exports = getModules(); diff --git a/os-league-tools-master/config/paths.js b/os-league-tools-master/config/paths.js new file mode 100644 index 00000000..fa6f2590 --- /dev/null +++ b/os-league-tools-master/config/paths.js @@ -0,0 +1,73 @@ +'use strict'; + +const path = require('path'); +const fs = require('fs'); +const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath'); + +// Make sure any symlinks in the project folder are resolved: +// https://github.com/facebook/create-react-app/issues/637 +const appDirectory = fs.realpathSync(process.cwd()); +const resolveApp = relativePath => path.resolve(appDirectory, relativePath); + +// We use `PUBLIC_URL` environment variable or "homepage" field to infer +// "public path" at which the app is served. +// webpack needs to know it to put the right