axiom-team
/
feedless
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename social to feedless

This commit is contained in:
Rogerio Chaves 2020-04-29 07:26:10 +02:00
parent 532f15c0a3
commit 909b76f167
No known key found for this signature in database
GPG Key ID: E6AF5440509B1D94
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/docker-compose.yml
View File

@ -1,12 +1,12 @@
version: "2"
services:
social:
feedless:
build: .
restart: always
network_mode: host
env_file: .env
volumes:
- social_ssb:/root/.social
- feedless_ssb:/root/.feedless
volumes:
social_ssb:
feedless_ssb:

2
web/lib/express.js
View File

@ -278,7 +278,7 @@ router.post("/keys/email", async (req, res) => {
sgMail.setApiKey(process.env.SENDGRID_API_KEY);
const msg = {
to: email,
from: "Social <rgrchvs@gmail.com>",
from: "Feedless <rgrchvs@gmail.com>",
subject: `Login button for ${req.context.profile.name}`,
html,
};

16
web/lib/metrics.js
View File

@ -9,36 +9,36 @@ const { Gauge, Summary, Counter } = prometheus;
module.exports = {
register,
router: new Counter({
name: "social_router",
name: "feedless_router",
help: "Routes accessed by users",
labelNames: ["method", "path"],
}),
ssbProgressRate: new Gauge({
name: "social_ssb_progress_rate",
name: "feedless_ssb_progress_rate",
help: "Tracks ssb syncing progress rate",
}),
ssbProgressFeeds: new Gauge({
name: "social_ssb_progress_feeds",
name: "feedless_ssb_progress_feeds",
help: "Tracks ssb syncing progress feeds",
}),
ssbProgressIncompleteFeeds: new Gauge({
name: "social_ssb_progress_incomplete_feeds",
name: "feedless_ssb_progress_incomplete_feeds",
help: "Tracks ssb syncing progress incomplete feeds",
}),
ssbProgressProgress: new Gauge({
name: "social_ssb_progress_progress",
name: "feedless_ssb_progress_progress",
help: "Tracks ssb syncing progress progress",
}),
ssbProgressTotal: new Gauge({
name: "social_ssb_progress_total",
name: "feedless_ssb_progress_total",
help: "Tracks ssb syncing progress total",
}),
searchResultsPeople: new Summary({
name: "social_search_results_people",
name: "feedless_search_results_people",
help: "Amount of people results returned from search",
}),
searchResultsCommunities: new Summary({
name: "social_search_results_communities",
name: "feedless_search_results_communities",
help: "Amount of communities results returned from search",
}),
};

2
web/lib/ssb-client.js
View File

@ -10,7 +10,7 @@ let ssbClient;
let homeFolder =
process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
let ssbSecret = ssbKeys.loadOrCreateSync(
`${homeFolder}/.${process.env.CONFIG_FOLDER || "social"}/secret`
`${homeFolder}/.${process.env.CONFIG_FOLDER || "feedless"}/secret`
);
let syncing = false;

2
web/lib/ssb-config.js
View File

@ -1,6 +1,6 @@
const configInject = require("ssb-config/inject");
module.exports = configInject(process.env.CONFIG_FOLDER || "social", {
module.exports = configInject(process.env.CONFIG_FOLDER || "feedless", {
connections: {
incoming: {
net: [

2
web/lib/utils.js
View File

@ -55,7 +55,7 @@ module.exports.asyncRouter = (app) => {
const ssbFolder = () => {
let homeFolder =
process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
return `${homeFolder}/.${process.env.CONFIG_FOLDER || "social"}`;
return `${homeFolder}/.${process.env.CONFIG_FOLDER || "feedless"}`;
};
module.exports.ssbFolder = ssbFolder;

2
web/package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "social-app",
"name": "feedless-app",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,

8
web/package.json
View File

@ -1,14 +1,14 @@
{
"name": "social-app",
"name": "feedless-app",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"start": "MODE=server SSB_PORT=8009 node index.js",
"start:client": "electron .",
"start:user-2": "SSB_PORT=8010 PORT=3001 CONFIG_FOLDER=social-user2 electron .",
"start:user-3": "SSB_PORT=8011 PORT=3002 CONFIG_FOLDER=social-user3 electron .",
"clear": "rm -rf ~/.social; rm -rf ~/.social-user2; rm -rf ~/.social-user3",
"start:user-2": "SSB_PORT=8010 PORT=3001 CONFIG_FOLDER=feedless-user2 electron .",
"start:user-3": "SSB_PORT=8011 PORT=3002 CONFIG_FOLDER=feedless-user3 electron .",
"clear": "rm -rf ~/.feedless; rm -rf ~/.feedless-user2; rm -rf ~/.feedless-user3",
"package:mac": "electron-packager . --platform=darwin --arch=x64 --out out/ --overwrite",
"package:linux": "electron-packager . --platform=linux --arch=x64 --out out/ --overwrite"
},

6
web/views/desktop/_header.ejs
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Social</title>
<title>Feedless</title>
<link rel="stylesheet" href="/shared.css">
<link rel="stylesheet" href="/desktop.css">
</head>
@ -11,7 +11,7 @@
<header class="screen-center">
<% if (context.profile && typeof hideHeader == "undefined") { %>
<div class="logo">
<a href="/">Social</a>
<a href="/">Feedless</a>
</div>
<nav>
<a href="/">Profile</a>
@ -23,7 +23,7 @@
<% if (context.profile.debug) { %>
<a href="/debug">Debug</a>
<% } %>
<a href="https://github.com/rogeriochaves/social/issues" target="_blank">Feedback</a>
<a href="https://github.com/rogeriochaves/feedless/issues" target="_blank">Feedback</a>
<a href="/logout">
Logout
</a>

2
web/views/desktop/error.ejs
View File

@ -1,6 +1,6 @@
<%- include('_header') %>
<h1>Social had an error</h1>
<h1>Feedless had an error</h1>
<p style="margin: 30px 0">If you are a developer, this should help:</p>
<pre style="white-space: pre-wrap"><%= error.stack %></pre>

6
web/views/mobile/_layout.ejs
View File

@ -3,13 +3,13 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0, width=device-width">
<title>Social</title>
<title>Feedless</title>
<link rel="stylesheet" href="/shared.css">
<link rel="stylesheet" href="/mobile.css">
</head>
<body>
<header>
<a class="logo" href="/">Social</a>
<a class="logo" href="/">Feedless</a>
<button class="open-menu js-open-menu">
<div class="menu-dash"></div>
<div class="menu-dash"></div>
@ -19,7 +19,7 @@
<div class="overlay js-top-menu-overlay" style="background: none; display: none"></div>
<div class="top-menu js-top-menu" style="display: none;">
<a href="/mobile/about">Edit profile</a>
<a href="https://github.com/rogeriochaves/social/issues" target="_blank">Feedback</a>
<a href="https://github.com/rogeriochaves/feedless/issues" target="_blank">Feedback</a>
<a href="/logout">
Logout
</a>

2
web/views/mobile/error.ejs
View File

@ -1,5 +1,5 @@
<div style="padding: 14px">
<h1>Social had an error</h1>
<h1>Feedless had an error</h1>
<p style="margin: 30px 0">If you are a developer, this should help:</p>
<pre style="white-space: pre-wrap"><%= error.stack %></pre>
</div>

4
web/views/shared/download.ejs
View File

@ -6,10 +6,10 @@
<p style="padding: 20px 0">
If you don't trust this server to hold your credentials, download the app version,
it keeps all the data local, which means your credentials never leave your computer,
plus you can use Social offline
plus you can use Feedless offline
</p>
<p>
<a href="https://github.com/rogeriochaves/social/releases">Go to downloads page</a>
<a href="https://github.com/rogeriochaves/feedless/releases">Go to downloads page</a>
</p>
</div>

6
web/views/shared/email_sign_in.ejs
View File

@ -1,14 +1,14 @@
<div style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; line-height: 1.3em; font-size: 16px; padding: 30px 0">
<h1 style="font-weight: bold; line-height: 1.3em; margin: 0; padding: 10px 0 0 0; font-weight: 200;">Login button</h1>
<p>Welcome to Social, please use the button below to login to your account:</p>
<p>Welcome to Feedless, please use the button below to login to your account:</p>
<form action="<%= origin %>/login" method="POST" style="padding: 20px 0">
<input type="hidden" name="ssb_key" value="<%= ssb_key %>" />
<input type="submit" value="Login to Social" style="background: #08d; color: #fff; border-radius: 3px; padding: 8px 10px; border: none; cursor: pointer; text-decoration: none; display: inline-block; padding: 16px 20px; font-size: 18px; -webkit-appearance: none;">
<input type="submit" value="Login to Feedless" style="background: #08d; color: #fff; border-radius: 3px; padding: 8px 10px; border: none; cursor: pointer; text-decoration: none; display: inline-block; padding: 16px 20px; font-size: 18px; -webkit-appearance: none;">
</form>
<p>
Never delete or forward this email, it is they key to accessing your account
</p>
<p>
From your friends at Social 😉
From your friends at Feedless 😉
</p>
</div>

8
web/views/shared/index.ejs
View File

@ -2,7 +2,7 @@
<div class="index-welcome">
<div class="screen-center">
<h1 style="font-size: 60px; font-family: 'Lucida Grande', sans-serif">Welcome to Social</h1>
<h1 style="font-size: 60px; font-family: 'Lucida Grande', sans-serif">Welcome to Feedless</h1>
<h2 style="padding: 20px 0">The non-addictive social network</h2>
<div style="padding-top: 20px">
@ -18,7 +18,7 @@
<div class="index-explanation">
<div class="screen-center">
<p>
Social combines the best original ideas of popular social networks without the bad parts
Feedless combines the best original ideas of popular social networks without the bad parts
</p>
<ul>
@ -30,8 +30,8 @@
</ul>
<p>
Because Social is not a business, we don't need to make people
addicted just to sell more ads and please shareholders. Social is built on top of
Because Feedless is not a business, we don't need to make people
addicted just to sell more ads and please shareholders. Feedless is built on top of
<a href="https://scuttlebutt.nz/" target="_blank" style="color: #600">SSB</a>,
a decentralized social network protocol, which means the community sustains it, not a corporation.
</p>

2
web/views/shared/login.ejs
View File

@ -4,7 +4,7 @@
<h1>Login</h1>
<p style="padding-top: 15px">
You should probably have received your login button by email, search for "Social login button", if not, then you must have saved your key, you can input it here
You should probably have received your login button by email, search for "Feedless login button", if not, then you must have saved your key, you can input it here
</p>
<form method="POST" action="/login" enctype="multipart/form-data">