Browse Source

fix: Json loading + incorrect urls in sign in\ sign up

develop
Dale 1 week ago
parent
commit
9b8a020efe
5 changed files with 16 additions and 4 deletions
  1. +1
    -0
      package.json
  2. +3
    -2
      src/config.ts
  3. +2
    -2
      src/domains/landing/components/Landing.tsx
  4. +5
    -0
      webpack.config.server.js
  5. +5
    -0
      yarn.lock

+ 1
- 0
package.json View File

@@ -41,6 +41,7 @@
"@types/shelljs": "^0.8.5",
"@types/superagent": "^4.1.1",
"copy-webpack-plugin": "^5.0.3",
"json-loader": "^0.5.7",
"nodemon-webpack-plugin": "^4.0.8",
"ts-loader": "^6.0.2",
"typescript": "^3.5.1",


+ 3
- 2
src/config.ts View File

@@ -2,7 +2,8 @@ interface IConfig {
'MASTODON_API_KEY': string;
}

const configPath = process.env.CONFIG_PATH || './config.json';
const config: IConfig = require(configPath);
const config: IConfig = {
MASTODON_API_KEY: "HpQ4g2FdqALY8tWynl5RrWkVptNAYFeRvkNjQrGo6yU",
};

export default config;

+ 2
- 2
src/domains/landing/components/Landing.tsx View File

@@ -53,8 +53,8 @@ const Landing: FC<Props> = ({ mastodon, mumble, xmpp, staticHost = 'http://local
The only requirement is to sound like an actual human
</p>
<ul className="links">
<li><a href="https://gensokyo.social/auth/sign_in" className="youmu-link">Sign Up</a></li>
<li><a href="https://gensokyo.social/auth/sign_up" className="youmu-link">Log In</a></li>
<li><a href="https://gensokyo.social/auth/sign_up" className="youmu-link">Sign Up</a></li>
<li><a href="https://gensokyo.social/auth/sign_in" className="youmu-link">Log In</a></li>
<li><a href="https://gensokyo.social/web/timelines/home" className="youmu-link">Home</a></li>
<li><a href="https://gensokyo.social/about" className="youmu-link">About Page</a></li>
</ul>


+ 5
- 0
webpack.config.server.js View File

@@ -14,6 +14,11 @@ module.exports = {
use: 'ts-loader',
exclude: /node_modules/,
},
{
test: /\.json?$/,
use: 'json-loader',
exclude: /node_modules/,
},
]
},
plugins: [


+ 5
- 0
yarn.lock View File

@@ -2822,6 +2822,11 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

json-loader@^0.5.7:
version "0.5.7"
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==

json-parse-better-errors@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"


Loading…
Cancel
Save